wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Henri Verbeet : winealsa.drv: Use the plughw instead of the hw interface for opening devices.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 232893e0832bf5082285995303c482d50570e5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=232893e0832bf508228599530… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:45 2011 +0200 winealsa.drv: Use the plughw instead of the hw interface for opening devices. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c609903..c77b54e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -285,7 +285,7 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char continue; } - sprintf(devnode, "hw:%d,%d", card, device); + sprintf(devnode, "plughw:%d,%d", card, device); if(!alsa_try_open(devnode, stream)){ if(count_failed) ++(*num);

1 0

Henri Verbeet : winealsa.drv: Only report endpoints for "default" if they can be opened.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 0625d439de7106c3fb32d31ccb453eaaf89d5773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625d439de7106c3fb32d31cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:44 2011 +0200 winealsa.drv: Only report endpoints for "default" if they can be opened. The default device may for example be a set of USB speakers or an USB microphone, in which case you'd have just an output or just an input respectively. --- dlls/winealsa.drv/mmdevdrv.c | 54 +++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e754738..c609903 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -237,15 +237,28 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, +static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) +{ + snd_pcm_t *handle; + int err; + + if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", + devnode, err, snd_strerror(err)); + return FALSE; + } + + snd_pcm_close(handle); + return TRUE; +} + +static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char **keys, UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW, BOOL count_failed) { static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; snd_pcm_info_t *info; - snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : - SND_PCM_STREAM_CAPTURE); info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); if(!info) @@ -259,7 +272,6 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, err = snd_ctl_pcm_next_device(ctl, &device)){ const char *devname; char devnode[32]; - snd_pcm_t *handle; snd_pcm_info_set_device(info, device); @@ -274,16 +286,12 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, } sprintf(devnode, "hw:%d,%d", card, device); - if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open, pretending it doesn't exist: %d (%s)\n", - devnode, err, snd_strerror(err)); + if(!alsa_try_open(devnode, stream)){ if(count_failed) ++(*num); continue; } - snd_pcm_close(handle); - if(ids && keys){ DWORD len, cardlen; @@ -333,10 +341,24 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, UINT *num, BOOL count_failed) { + snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : + SND_PCM_STREAM_CAPTURE); int err, card; card = -1; *num = 0; + + if(alsa_try_open(defname, stream)){ + if(ids && keys){ + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); + memcpy(*ids, defaultW, sizeof(defaultW)); + *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(defname)); + memcpy(*keys, defname, sizeof(defname)); + } + ++*num; + }else if(count_failed) + ++*num; + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; @@ -368,7 +390,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW, + alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW, count_failed); HeapFree(GetProcessHeap(), 0, cardnameW); @@ -401,21 +423,17 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, return S_OK; } - *ids = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(WCHAR *)); - *keys = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(char *)); + *ids = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(WCHAR *)); + *keys = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(char *)); if(!*ids || !*keys){ HeapFree(GetProcessHeap(), 0, *ids); HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; } - (*ids)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - memcpy((*ids)[0], defaultW, sizeof(defaultW)); - (*keys)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defname)); - memcpy((*keys)[0], defname, sizeof(defname)); *def_index = 0; - hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num, FALSE); + hr = alsa_enum_devices(flow, *ids, *keys, num, FALSE); if(FAILED(hr)){ int i; for(i = 0; i < *num; ++i){ @@ -427,8 +445,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, return E_OUTOFMEMORY; } - ++(*num); /* for default device */ - return S_OK; }

1 0

Henri Verbeet : server: Try writing to /proc/<pid>/ mem in write_process_memory().
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: e7728c413298025077054187d57e6a7783b3de38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7728c413298025077054187d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:43 2011 +0200 server: Try writing to /proc/<pid>/mem in write_process_memory(). --- server/ptrace.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 51157ab..6c14481 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -463,6 +463,25 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t set_error( STATUS_ACCESS_DENIED ); goto done; } + + if (len > 3) + { + char procmem[24]; + int fd; + + sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + if ((fd = open( procmem, O_WRONLY )) != -1) + { + ssize_t r = pwrite( fd, src, size, ptr ); + close( fd ); + if (r == size) + { + ret = 1; + goto done; + } + } + } + /* first word is special */ if (len > 1) {

1 0

Alexandre Julliard : user32/tests: Try harder to flush paint events before checking the window contents.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: a684b634c01a58633e65b1c4dd1f70f5c99530ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a684b634c01a58633e65b1c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 09:35:05 2011 +0200 user32/tests: Try harder to flush paint events before checking the window contents. --- dlls/user32/tests/static.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index b761356..62089bd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -40,6 +40,22 @@ static HWND hMainWnd; static int g_nReceivedColorStatic = 0; +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static HWND build_static(DWORD style) { return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); @@ -70,6 +86,7 @@ static void test_updates(int style, int flags) HWND hStatic = build_static(style); int exp; + flush_events(); trace("Testing style 0x%x\n", style); g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ @@ -122,7 +139,6 @@ START_TEST(static) hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - UpdateWindow(hMainWnd); test_updates(0, 0); test_updates(SS_SIMPLE, 0);

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.6.6.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: bugzilla Branch: upstream Commit: afec5e31f59d964e67906fc0f7d1711662ccd6eb URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=afec5e31f59d964e67906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 14:54:44 2011 +0200 Import of upstream bugzilla release 3.6.6. --- .bzrignore | 31 + .bzrrev | 1 + Bugzilla.pm | 225 +++- Bugzilla/Attachment.pm | 674 ++++++----- Bugzilla/Attachment/PatchReader.pm | 2 + Bugzilla/Auth.pm | 63 +- Bugzilla/Auth/Login/CGI.pm | 25 +- Bugzilla/Auth/Login/Cookie.pm | 27 +- Bugzilla/Auth/Login/Stack.pm | 2 +- Bugzilla/Auth/Persist/Cookie.pm | 28 +- Bugzilla/Auth/Verify/DB.pm | 52 +- Bugzilla/Auth/Verify/LDAP.pm | 33 +- Bugzilla/Auth/Verify/Stack.pm | 2 +- Bugzilla/Bug.pm | 554 +++++---- Bugzilla/BugMail.pm | 71 +- Bugzilla/CGI.pm | 152 ++- Bugzilla/Classification.pm | 2 +- Bugzilla/Comment.pm | 298 +++++ Bugzilla/Component.pm | 18 +- Bugzilla/Config.pm | 41 +- Bugzilla/Config/Admin.pm | 2 +- Bugzilla/Config/Advanced.pm | 57 + Bugzilla/Config/Attachment.pm | 9 +- Bugzilla/Config/Auth.pm | 9 +- Bugzilla/Config/BugChange.pm | 2 +- Bugzilla/Config/BugFields.pm | 2 +- Bugzilla/Config/BugMove.pm | 2 +- Bugzilla/Config/Common.pm | 79 +- Bugzilla/Config/Core.pm | 70 +- Bugzilla/Config/DependencyGraph.pm | 2 +- Bugzilla/Config/General.pm | 83 ++ Bugzilla/Config/GroupSecurity.pm | 8 +- Bugzilla/Config/LDAP.pm | 2 +- Bugzilla/Config/MTA.pm | 2 +- Bugzilla/Config/PatchViewer.pm | 2 +- Bugzilla/Config/Query.pm | 9 +- Bugzilla/Config/RADIUS.pm | 2 +- Bugzilla/Config/ShadowDB.pm | 2 +- Bugzilla/Config/UserMatch.pm | 9 +- Bugzilla/Constants.pm | 99 ++- Bugzilla/DB.pm | 66 +- Bugzilla/DB/Mysql.pm | 124 ++- Bugzilla/DB/Oracle.pm | 104 ++ Bugzilla/DB/Pg.pm | 34 +- Bugzilla/DB/Schema.pm | 107 ++- Bugzilla/DB/Schema/Mysql.pm | 31 +- Bugzilla/DB/Schema/Oracle.pm | 28 + Bugzilla/DB/Schema/Pg.pm | 9 +- Bugzilla/Error.pm | 29 +- Bugzilla/Extension.pm | 801 +++++++++++++ Bugzilla/Field.pm | 26 +- Bugzilla/Field/Choice.pm | 23 +- Bugzilla/Flag.pm | 1219 +++++++++----------- Bugzilla/Group.pm | 203 +++- Bugzilla/Hook.pm | 791 ++++++++++--- Bugzilla/Install.pm | 105 +- Bugzilla/Install/CPAN.pm | 118 ++- Bugzilla/Install/DB.pm | 429 +++++-- Bugzilla/Install/Filesystem.pm | 112 ++- Bugzilla/Install/Localconfig.pm | 45 +- Bugzilla/Install/Requirements.pm | 236 +++-- Bugzilla/Install/Util.pm | 352 +++++- Bugzilla/JobQueue.pm | 6 +- Bugzilla/Keyword.pm | 16 - Bugzilla/Mailer.pm | 7 +- Bugzilla/Migrate.pm | 1171 ++++++++++++++++++ Bugzilla/Migrate/Gnats.pm | 709 +++++++++++ Bugzilla/Object.pm | 88 ++- Bugzilla/Product.pm | 95 ++- Bugzilla/Search.pm | 234 +++-- Bugzilla/Search/Quicksearch.pm | 737 +++++++----- Bugzilla/Search/Saved.pm | 70 +- Bugzilla/Series.pm | 37 +- Bugzilla/Status.pm | 42 +- Bugzilla/Template.pm | 399 ++++--- Bugzilla/Template/Context.pm | 104 ++ Bugzilla/Template/Plugin/Hook.pm | 117 +- Bugzilla/Token.pm | 4 +- Bugzilla/Update.pm | 26 +- Bugzilla/User.pm | 432 ++++--- Bugzilla/Util.pm | 339 ++++--- Bugzilla/Version.pm | 199 ++-- Bugzilla/WebService.pm | 217 ++-- Bugzilla/WebService/Bug.pm | 747 ++++++++++-- Bugzilla/WebService/Bugzilla.pm | 109 +- Bugzilla/WebService/Constants.pm | 21 +- Bugzilla/WebService/README | 18 + Bugzilla/WebService/Server.pm | 44 +- Bugzilla/WebService/Server/JSONRPC.pm | 337 ++++++ Bugzilla/WebService/Server/XMLRPC.pm | 143 ++- Bugzilla/WebService/User.pm | 33 +- Bugzilla/WebService/Util.pm | 42 +- Bugzilla/Whine/Query.pm | 136 +++ Bugzilla/Whine/Schedule.pm | 172 +++ attachment.cgi | 536 +++++---- buglist.cgi | 175 ++-- bugzilla.dtd | 8 + chart.cgi | 124 ++- checksetup.pl | 27 +- colchange.cgi | 22 +- collectstats.pl | 97 +-- config.cgi | 57 +- contrib/.cvsignore | 1 + contrib/bugzilla-submit/bugzilla-submit | 2 +- contrib/bugzilla_ldapsync.rb | 2 - contrib/bz_webservice_demo.pl | 2 +- contrib/bzdbcopy.pl | 3 +- contrib/console.pl | 186 +++ contrib/extension-convert.pl | 303 +++++ .../code/webservice.pl => contrib/fixperms.pl | 15 +- contrib/gnats2bz.pl | 1067 ----------------- contrib/gnatsparse/README | 62 - contrib/gnatsparse/gnatsparse.py | 807 ------------- contrib/gnatsparse/magic.py | 712 ----------- contrib/gnatsparse/specialuu.py | 104 -- contrib/sendbugmail.pl | 2 - contrib/yp_nomail.sh | 1 - docs/bugzilla.ent | 8 +- docs/en/README.docs | 8 +- docs/en/xml/Bugzilla-Guide.xml | 11 +- docs/en/xml/about.xml | 42 +- docs/en/xml/administration.xml | 72 +- docs/en/xml/bugzilla.ent | 8 +- docs/en/xml/customization.xml | 256 +---- docs/en/xml/installation.xml | 271 ++--- docs/en/xml/introduction.xml | 121 -- docs/en/xml/modules.xml | 10 +- docs/en/xml/security.xml | 1 - docs/en/xml/troubleshooting.xml | 30 - docs/en/xml/using.xml | 10 +- docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 2 +- duplicates.cgi | 395 +++---- editcomponents.cgi | 22 +- editflagtypes.cgi | 12 +- editgroups.cgi | 172 +--- editkeywords.cgi | 4 +- editparams.cgi | 4 +- editproducts.cgi | 44 +- editusers.cgi | 62 +- editvalues.cgi | 3 + editversions.cgi | 7 +- editwhines.cgi | 117 +-- email_in.pl | 218 +++-- enter_bug.cgi | 101 +- .../mailer-before_send.pl => BmpConvert/Config.pm} | 25 +- extensions/BmpConvert/Extension.pm | 57 + extensions/{example => BmpConvert}/disabled | 0 .../lib/WSExample.pm => Example/Config.pm} | 34 +- extensions/Example/Extension.pm | 607 ++++++++++ extensions/{example => Example}/disabled | 0 .../lib/AuthLogin.pm => Example/lib/Auth/Login.pm} | 2 +- .../AuthVerify.pm => Example/lib/Auth/Verify.pm} | 2 +- .../lib/ConfigExample.pm => Example/lib/Config.pm} | 2 +- .../lib/Util.pm} | 11 +- .../lib/WSExample.pm => Example/lib/WebService.pm} | 4 +- .../en/default/admin/params/example.html.tmpl | 0 .../admin/sanitycheck/messages-statuses.html.tmpl | 35 + .../hook}/global/user-error-errors.html.tmpl | 0 .../template/en/default/pages/example.html.tmpl | 0 .../template/en/default/setup/strings.txt.pl} | 23 +- extensions/create.pl | 85 ++ 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-end_of_update.pl | 56 - extensions/example/code/bug-fields.pl | 27 - extensions/example/code/buglist-columns.pl | 26 - extensions/example/code/colchange-columns.pl | 27 - extensions/example/code/config-add_panels.pl | 25 - extensions/example/code/config-modify_panels.pl | 32 - 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/page-before_template.pl | 33 - extensions/example/code/product-confirm_delete.pl | 26 - extensions/example/info.pl | 41 - importxml.pl | 12 +- index.cgi | 8 - install-module.pl | 20 +- js/attachment.js | 128 ++ js/field.js | 42 +- js/flag.js | 75 ++ js/global.js | 9 + jsonrpc.cgi | 41 + migrate.pl | 110 ++ mod_perl.pl | 74 +- page.cgi | 39 +- post_bug.cgi | 129 +-- process_bug.cgi | 149 +-- query.cgi | 38 +- quips.cgi | 7 +- relogin.cgi | 8 +- report.cgi | 28 +- reports.cgi | 130 +-- request.cgi | 10 +- sanitycheck.cgi | 33 +- sanitycheck.pl | 2 +- show_bug.cgi | 17 +- showdependencygraph.cgi | 10 +- skins/contrib/Dusk/.cvsignore | 1 + skins/contrib/Dusk/global.css | 25 +- skins/standard/IE-fixes.css | 4 + skins/standard/buglist.css | 19 + skins/standard/create_attachment.css | 39 + skins/standard/duplicates.css | 45 +- skins/standard/global.css | 64 +- skins/standard/page.css | 70 ++ skins/standard/release-notes.css | 35 - skins/standard/reports.css | 89 ++ skins/standard/show_bug.css | 23 + summarize_time.cgi | 2 +- t/.cvsignore | 1 + t/001compile.t | 136 +-- t/007util.t | 2 +- t/008filter.t | 9 +- t/012throwables.t | 12 +- t/Support/Files.pm | 30 +- .../en/default/account/auth/login-small.html.tmpl | 18 +- template/en/default/account/auth/login.html.tmpl | 20 +- .../en/default/account/email/confirm-new.html.tmpl | 9 +- .../password/set-forgotten-password.html.tmpl | 5 +- .../en/default/account/prefs/account.html.tmpl | 5 +- .../default/account/prefs/saved-searches.html.tmpl | 17 +- .../en/default/account/profile-activity.html.tmpl | 2 +- template/en/default/admin/admin.html.tmpl | 32 +- .../en/default/admin/classifications/add.html.tmpl | 3 +- .../en/default/admin/classifications/del.html.tmpl | 3 +- .../default/admin/classifications/edit.html.tmpl | 3 +- .../default/admin/classifications/footer.html.tmpl | 24 + .../admin/classifications/reclassify.html.tmpl | 3 +- .../admin/components/confirm-delete.html.tmpl | 4 +- .../en/default/admin/components/list.html.tmpl | 13 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 2 +- .../en/default/admin/custom_fields/edit.html.tmpl | 2 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 4 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 13 +- .../en/default/admin/fieldvalues/list.html.tmpl | 5 + template/en/default/admin/groups/delete.html.tmpl | 124 ++- .../en/default/admin/milestones/list.html.tmpl | 2 + .../en/default/admin/params/advanced.html.tmpl | 50 + .../en/default/admin/params/attachment.html.tmpl | 13 +- template/en/default/admin/params/auth.html.tmpl | 5 - template/en/default/admin/params/common.html.tmpl | 26 +- template/en/default/admin/params/core.html.tmpl | 76 +-- .../en/default/admin/params/editparams.html.tmpl | 3 +- template/en/default/admin/params/general.html.tmpl | 86 ++ .../default/admin/params/groupsecurity.html.tmpl | 6 - template/en/default/admin/params/query.html.tmpl | 10 +- .../en/default/admin/params/usermatch.html.tmpl | 6 - .../admin/products/confirm-delete.html.tmpl | 11 +- .../en/default/admin/products/create.html.tmpl | 7 +- .../default/admin/products/edit-common.html.tmpl | 82 +- template/en/default/admin/products/edit.html.tmpl | 1 + template/en/default/admin/products/list.html.tmpl | 15 +- .../en/default/admin/products/updated.html.tmpl | 47 +- .../default/admin/sanitycheck/messages.html.tmpl | 11 + template/en/default/admin/sudo.html.tmpl | 3 +- template/en/default/admin/table.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 5 +- template/en/default/admin/versions/list.html.tmpl | 2 + .../en/default/admin/workflow/comment.html.tmpl | 4 +- template/en/default/admin/workflow/edit.html.tmpl | 10 +- template/en/default/attachment/create.html.tmpl | 27 +- template/en/default/attachment/created.html.tmpl | 16 +- template/en/default/attachment/diff-file.html.tmpl | 42 +- .../en/default/attachment/diff-footer.html.tmpl | 3 + .../en/default/attachment/diff-header.html.tmpl | 2 + template/en/default/attachment/edit.html.tmpl | 307 ++--- template/en/default/attachment/list.html.tmpl | 8 +- .../en/default/attachment/show-multiple.html.tmpl | 3 +- template/en/default/attachment/updated.html.tmpl | 20 +- template/en/default/bug/activity/show.html.tmpl | 4 +- template/en/default/bug/activity/table.html.tmpl | 72 +- template/en/default/bug/comments.html.tmpl | 44 +- .../en/default/bug/create/create-guided.html.tmpl | 2 + template/en/default/bug/create/create.html.tmpl | 57 +- template/en/default/bug/create/created.html.tmpl | 14 +- template/en/default/bug/dependency-tree.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 386 +++---- template/en/default/bug/field.html.tmpl | 7 +- template/en/default/bug/format_comment.txt.tmpl | 46 +- template/en/default/bug/knob.html.tmpl | 127 +-- template/en/default/bug/navigate.html.tmpl | 25 +- template/en/default/bug/process/bugmail.html.tmpl | 21 +- template/en/default/bug/process/header.html.tmpl | 8 +- template/en/default/bug/process/midair.html.tmpl | 5 +- template/en/default/bug/process/results.html.tmpl | 2 - .../bug/process/verify-new-product.html.tmpl | 2 + template/en/default/bug/show-header.html.tmpl | 50 + template/en/default/bug/show-multiple.html.tmpl | 20 +- template/en/default/bug/show.html.tmpl | 24 +- template/en/default/bug/show.xml.tmpl | 64 +- template/en/default/bug/summarize-time.html.tmpl | 2 +- template/en/default/bug/votes/delete-all.html.tmpl | 1 + .../en/default/bug/votes/list-for-user.html.tmpl | 3 +- template/en/default/config.rdf.tmpl | 93 +- template/en/default/email/lockout.txt.tmpl | 39 + template/en/default/email/newchangedmail.txt.tmpl | 6 +- template/en/default/email/whine.txt.tmpl | 12 +- template/en/default/extensions/config.pm.tmpl | 41 + template/en/default/extensions/extension.pm.tmpl | 46 + .../en/default/extensions/hook-readme.txt.tmpl | 27 + template/en/default/extensions/license.txt.tmpl | 47 + .../en/default/extensions/name-readme.txt.tmpl | 38 + template/en/default/extensions/util.pm.tmpl | 42 + template/en/default/filterexceptions.pl | 38 +- template/en/default/flag/list.html.tmpl | 225 ++--- .../en/default/global/choose-product.html.tmpl | 8 +- template/en/default/global/code-error.html.tmpl | 150 ++- template/en/default/global/common-links.html.tmpl | 11 +- .../en/default/global/confirm-user-match.html.tmpl | 39 +- template/en/default/global/field-descs.none.tmpl | 201 ++-- template/en/default/global/footer.html.tmpl | 6 +- template/en/default/global/header.html.tmpl | 40 +- template/en/default/global/messages.html.tmpl | 103 ++- .../en/default/global/per-bug-queries.html.tmpl | 2 +- .../en/default/global/site-navigation.html.tmpl | 26 - template/en/default/global/tabs.html.tmpl | 8 +- template/en/default/global/textarea.html.tmpl | 2 + template/en/default/global/user-error.html.tmpl | 234 +++-- template/en/default/index.html.tmpl | 17 +- template/en/default/list/edit-multiple.html.tmpl | 28 +- template/en/default/list/list.atom.tmpl | 18 +- template/en/default/list/list.csv.tmpl | 4 +- template/en/default/list/list.html.tmpl | 62 +- template/en/default/list/list.ics.tmpl | 1 + template/en/default/list/quips.html.tmpl | 7 +- template/en/default/list/table.html.tmpl | 109 +- template/en/default/pages/bug-writing.html.tmpl | 4 +- template/en/default/pages/fields.html.tmpl | 101 +- template/en/default/pages/quicksearch.html.tmpl | 365 ++++--- .../en/default/pages/quicksearchhack.html.tmpl | 387 ------ template/en/default/pages/release-notes.html.tmpl | 1261 +++++++++++++++++--- template/en/default/reports/components.html.tmpl | 63 +- template/en/default/reports/create-chart.html.tmpl | 24 +- .../en/default/reports/delete-series.html.tmpl | 59 + .../en/default/reports/duplicates-simple.html.tmpl | 18 +- .../en/default/reports/duplicates-table.html.tmpl | 166 ++-- template/en/default/reports/duplicates.html.tmpl | 70 +- template/en/default/reports/edit-series.html.tmpl | 8 +- template/en/default/reports/menu.html.tmpl | 54 +- template/en/default/reports/old-charts.html.tmpl | 2 +- template/en/default/reports/report-bar.png.tmpl | 24 +- template/en/default/reports/report-line.png.tmpl | 24 +- template/en/default/reports/report-pie.png.tmpl | 12 +- template/en/default/reports/report-table.csv.tmpl | 8 +- template/en/default/reports/report-table.html.tmpl | 8 +- template/en/default/request/email.txt.tmpl | 21 +- template/en/default/request/queue.html.tmpl | 70 +- .../en/default/search/boolean-charts.html.tmpl | 1 + template/en/default/search/form.html.tmpl | 62 +- .../default/search/search-create-series.html.tmpl | 1 + .../en/default/search/search-specific.html.tmpl | 2 +- template/en/default/search/tabs.html.tmpl | 2 +- template/en/default/setup/strings.txt.pl | 33 +- template/en/default/welcome-admin.html.tmpl | 9 +- template/en/default/whine/mail.html.tmpl | 10 +- template/en/default/whine/mail.txt.tmpl | 10 +- template/en/default/whine/schedule.html.tmpl | 10 + template/en/extension/filterexceptions.pl | 42 - testserver.pl | 16 +- token.cgi | 16 +- userprefs.cgi | 52 +- votes.cgi | 9 +- whine.pl | 20 +- xmlrpc.cgi | 13 +- 367 files changed, 18756 insertions(+), 12280 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=afec5e31f59d964e6…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: bugzilla Branch: master Commit: 5c10e3ce2450db36d48c417c2bcb0a94650a7f9e URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=5c10e3ce2450db36d48c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 15:15:02 2011 +0200 Merge branch 'upstream'. Conflicts: Bugzilla/Attachment.pm skins/contrib/Dusk/.cvsignore skins/standard/global.css template/en/default/bug/edit.html.tmpl template/en/default/global/common-links.html.tmpl template/en/default/global/footer.html.tmpl template/en/default/global/header.html.tmpl template/en/default/index.html.tmpl ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.6.6.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: bugzilla Branch: master Commit: afec5e31f59d964e67906fc0f7d1711662ccd6eb URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=afec5e31f59d964e67906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 14:54:44 2011 +0200 Import of upstream bugzilla release 3.6.6. --- .bzrignore | 31 + .bzrrev | 1 + Bugzilla.pm | 225 +++- Bugzilla/Attachment.pm | 674 ++++++----- Bugzilla/Attachment/PatchReader.pm | 2 + Bugzilla/Auth.pm | 63 +- Bugzilla/Auth/Login/CGI.pm | 25 +- Bugzilla/Auth/Login/Cookie.pm | 27 +- Bugzilla/Auth/Login/Stack.pm | 2 +- Bugzilla/Auth/Persist/Cookie.pm | 28 +- Bugzilla/Auth/Verify/DB.pm | 52 +- Bugzilla/Auth/Verify/LDAP.pm | 33 +- Bugzilla/Auth/Verify/Stack.pm | 2 +- Bugzilla/Bug.pm | 554 +++++---- Bugzilla/BugMail.pm | 71 +- Bugzilla/CGI.pm | 152 ++- Bugzilla/Classification.pm | 2 +- Bugzilla/Comment.pm | 298 +++++ Bugzilla/Component.pm | 18 +- Bugzilla/Config.pm | 41 +- Bugzilla/Config/Admin.pm | 2 +- Bugzilla/Config/Advanced.pm | 57 + Bugzilla/Config/Attachment.pm | 9 +- Bugzilla/Config/Auth.pm | 9 +- Bugzilla/Config/BugChange.pm | 2 +- Bugzilla/Config/BugFields.pm | 2 +- Bugzilla/Config/BugMove.pm | 2 +- Bugzilla/Config/Common.pm | 79 +- Bugzilla/Config/Core.pm | 70 +- Bugzilla/Config/DependencyGraph.pm | 2 +- Bugzilla/Config/General.pm | 83 ++ Bugzilla/Config/GroupSecurity.pm | 8 +- Bugzilla/Config/LDAP.pm | 2 +- Bugzilla/Config/MTA.pm | 2 +- Bugzilla/Config/PatchViewer.pm | 2 +- Bugzilla/Config/Query.pm | 9 +- Bugzilla/Config/RADIUS.pm | 2 +- Bugzilla/Config/ShadowDB.pm | 2 +- Bugzilla/Config/UserMatch.pm | 9 +- Bugzilla/Constants.pm | 99 ++- Bugzilla/DB.pm | 66 +- Bugzilla/DB/Mysql.pm | 124 ++- Bugzilla/DB/Oracle.pm | 104 ++ Bugzilla/DB/Pg.pm | 34 +- Bugzilla/DB/Schema.pm | 107 ++- Bugzilla/DB/Schema/Mysql.pm | 31 +- Bugzilla/DB/Schema/Oracle.pm | 28 + Bugzilla/DB/Schema/Pg.pm | 9 +- Bugzilla/Error.pm | 29 +- Bugzilla/Extension.pm | 801 +++++++++++++ Bugzilla/Field.pm | 26 +- Bugzilla/Field/Choice.pm | 23 +- Bugzilla/Flag.pm | 1219 +++++++++----------- Bugzilla/Group.pm | 203 +++- Bugzilla/Hook.pm | 791 ++++++++++--- Bugzilla/Install.pm | 105 +- Bugzilla/Install/CPAN.pm | 118 ++- Bugzilla/Install/DB.pm | 429 +++++-- Bugzilla/Install/Filesystem.pm | 112 ++- Bugzilla/Install/Localconfig.pm | 45 +- Bugzilla/Install/Requirements.pm | 236 +++-- Bugzilla/Install/Util.pm | 352 +++++- Bugzilla/JobQueue.pm | 6 +- Bugzilla/Keyword.pm | 16 - Bugzilla/Mailer.pm | 7 +- Bugzilla/Migrate.pm | 1171 ++++++++++++++++++ Bugzilla/Migrate/Gnats.pm | 709 +++++++++++ Bugzilla/Object.pm | 88 ++- Bugzilla/Product.pm | 95 ++- Bugzilla/Search.pm | 234 +++-- Bugzilla/Search/Quicksearch.pm | 737 +++++++----- Bugzilla/Search/Saved.pm | 70 +- Bugzilla/Series.pm | 37 +- Bugzilla/Status.pm | 42 +- Bugzilla/Template.pm | 399 ++++--- Bugzilla/Template/Context.pm | 104 ++ Bugzilla/Template/Plugin/Hook.pm | 117 +- Bugzilla/Token.pm | 4 +- Bugzilla/Update.pm | 26 +- Bugzilla/User.pm | 432 ++++--- Bugzilla/Util.pm | 339 ++++--- Bugzilla/Version.pm | 199 ++-- Bugzilla/WebService.pm | 217 ++-- Bugzilla/WebService/Bug.pm | 747 ++++++++++-- Bugzilla/WebService/Bugzilla.pm | 109 +- Bugzilla/WebService/Constants.pm | 21 +- Bugzilla/WebService/README | 18 + Bugzilla/WebService/Server.pm | 44 +- Bugzilla/WebService/Server/JSONRPC.pm | 337 ++++++ Bugzilla/WebService/Server/XMLRPC.pm | 143 ++- Bugzilla/WebService/User.pm | 33 +- Bugzilla/WebService/Util.pm | 42 +- Bugzilla/Whine/Query.pm | 136 +++ Bugzilla/Whine/Schedule.pm | 172 +++ attachment.cgi | 536 +++++---- buglist.cgi | 175 ++-- bugzilla.dtd | 8 + chart.cgi | 124 ++- checksetup.pl | 27 +- colchange.cgi | 22 +- collectstats.pl | 97 +-- config.cgi | 57 +- contrib/.cvsignore | 1 + contrib/bugzilla-submit/bugzilla-submit | 2 +- contrib/bugzilla_ldapsync.rb | 2 - contrib/bz_webservice_demo.pl | 2 +- contrib/bzdbcopy.pl | 3 +- contrib/console.pl | 186 +++ contrib/extension-convert.pl | 303 +++++ .../code/webservice.pl => contrib/fixperms.pl | 15 +- contrib/gnats2bz.pl | 1067 ----------------- contrib/gnatsparse/README | 62 - contrib/gnatsparse/gnatsparse.py | 807 ------------- contrib/gnatsparse/magic.py | 712 ----------- contrib/gnatsparse/specialuu.py | 104 -- contrib/sendbugmail.pl | 2 - contrib/yp_nomail.sh | 1 - docs/bugzilla.ent | 8 +- docs/en/README.docs | 8 +- docs/en/xml/Bugzilla-Guide.xml | 11 +- docs/en/xml/about.xml | 42 +- docs/en/xml/administration.xml | 72 +- docs/en/xml/bugzilla.ent | 8 +- docs/en/xml/customization.xml | 256 +---- docs/en/xml/installation.xml | 271 ++--- docs/en/xml/introduction.xml | 121 -- docs/en/xml/modules.xml | 10 +- docs/en/xml/security.xml | 1 - docs/en/xml/troubleshooting.xml | 30 - docs/en/xml/using.xml | 10 +- docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 2 +- duplicates.cgi | 395 +++---- editcomponents.cgi | 22 +- editflagtypes.cgi | 12 +- editgroups.cgi | 172 +--- editkeywords.cgi | 4 +- editparams.cgi | 4 +- editproducts.cgi | 44 +- editusers.cgi | 62 +- editvalues.cgi | 3 + editversions.cgi | 7 +- editwhines.cgi | 117 +-- email_in.pl | 218 +++-- enter_bug.cgi | 101 +- .../mailer-before_send.pl => BmpConvert/Config.pm} | 25 +- extensions/BmpConvert/Extension.pm | 57 + extensions/{example => BmpConvert}/disabled | 0 .../lib/WSExample.pm => Example/Config.pm} | 34 +- extensions/Example/Extension.pm | 607 ++++++++++ extensions/{example => Example}/disabled | 0 .../lib/AuthLogin.pm => Example/lib/Auth/Login.pm} | 2 +- .../AuthVerify.pm => Example/lib/Auth/Verify.pm} | 2 +- .../lib/ConfigExample.pm => Example/lib/Config.pm} | 2 +- .../lib/Util.pm} | 11 +- .../lib/WSExample.pm => Example/lib/WebService.pm} | 4 +- .../en/default/admin/params/example.html.tmpl | 0 .../admin/sanitycheck/messages-statuses.html.tmpl | 35 + .../hook}/global/user-error-errors.html.tmpl | 0 .../template/en/default/pages/example.html.tmpl | 0 .../template/en/default/setup/strings.txt.pl} | 23 +- extensions/create.pl | 85 ++ 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-end_of_update.pl | 56 - extensions/example/code/bug-fields.pl | 27 - extensions/example/code/buglist-columns.pl | 26 - extensions/example/code/colchange-columns.pl | 27 - extensions/example/code/config-add_panels.pl | 25 - extensions/example/code/config-modify_panels.pl | 32 - 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/page-before_template.pl | 33 - extensions/example/code/product-confirm_delete.pl | 26 - extensions/example/info.pl | 41 - importxml.pl | 12 +- index.cgi | 8 - install-module.pl | 20 +- js/attachment.js | 128 ++ js/field.js | 42 +- js/flag.js | 75 ++ js/global.js | 9 + jsonrpc.cgi | 41 + migrate.pl | 110 ++ mod_perl.pl | 74 +- page.cgi | 39 +- post_bug.cgi | 129 +-- process_bug.cgi | 149 +-- query.cgi | 38 +- quips.cgi | 7 +- relogin.cgi | 8 +- report.cgi | 28 +- reports.cgi | 130 +-- request.cgi | 10 +- sanitycheck.cgi | 33 +- sanitycheck.pl | 2 +- show_bug.cgi | 17 +- showdependencygraph.cgi | 10 +- skins/contrib/Dusk/.cvsignore | 1 + skins/contrib/Dusk/global.css | 25 +- skins/standard/IE-fixes.css | 4 + skins/standard/buglist.css | 19 + skins/standard/create_attachment.css | 39 + skins/standard/duplicates.css | 45 +- skins/standard/global.css | 64 +- skins/standard/page.css | 70 ++ skins/standard/release-notes.css | 35 - skins/standard/reports.css | 89 ++ skins/standard/show_bug.css | 23 + summarize_time.cgi | 2 +- t/.cvsignore | 1 + t/001compile.t | 136 +-- t/007util.t | 2 +- t/008filter.t | 9 +- t/012throwables.t | 12 +- t/Support/Files.pm | 30 +- .../en/default/account/auth/login-small.html.tmpl | 18 +- template/en/default/account/auth/login.html.tmpl | 20 +- .../en/default/account/email/confirm-new.html.tmpl | 9 +- .../password/set-forgotten-password.html.tmpl | 5 +- .../en/default/account/prefs/account.html.tmpl | 5 +- .../default/account/prefs/saved-searches.html.tmpl | 17 +- .../en/default/account/profile-activity.html.tmpl | 2 +- template/en/default/admin/admin.html.tmpl | 32 +- .../en/default/admin/classifications/add.html.tmpl | 3 +- .../en/default/admin/classifications/del.html.tmpl | 3 +- .../default/admin/classifications/edit.html.tmpl | 3 +- .../default/admin/classifications/footer.html.tmpl | 24 + .../admin/classifications/reclassify.html.tmpl | 3 +- .../admin/components/confirm-delete.html.tmpl | 4 +- .../en/default/admin/components/list.html.tmpl | 13 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 2 +- .../en/default/admin/custom_fields/edit.html.tmpl | 2 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 4 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 13 +- .../en/default/admin/fieldvalues/list.html.tmpl | 5 + template/en/default/admin/groups/delete.html.tmpl | 124 ++- .../en/default/admin/milestones/list.html.tmpl | 2 + .../en/default/admin/params/advanced.html.tmpl | 50 + .../en/default/admin/params/attachment.html.tmpl | 13 +- template/en/default/admin/params/auth.html.tmpl | 5 - template/en/default/admin/params/common.html.tmpl | 26 +- template/en/default/admin/params/core.html.tmpl | 76 +-- .../en/default/admin/params/editparams.html.tmpl | 3 +- template/en/default/admin/params/general.html.tmpl | 86 ++ .../default/admin/params/groupsecurity.html.tmpl | 6 - template/en/default/admin/params/query.html.tmpl | 10 +- .../en/default/admin/params/usermatch.html.tmpl | 6 - .../admin/products/confirm-delete.html.tmpl | 11 +- .../en/default/admin/products/create.html.tmpl | 7 +- .../default/admin/products/edit-common.html.tmpl | 82 +- template/en/default/admin/products/edit.html.tmpl | 1 + template/en/default/admin/products/list.html.tmpl | 15 +- .../en/default/admin/products/updated.html.tmpl | 47 +- .../default/admin/sanitycheck/messages.html.tmpl | 11 + template/en/default/admin/sudo.html.tmpl | 3 +- template/en/default/admin/table.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 5 +- template/en/default/admin/versions/list.html.tmpl | 2 + .../en/default/admin/workflow/comment.html.tmpl | 4 +- template/en/default/admin/workflow/edit.html.tmpl | 10 +- template/en/default/attachment/create.html.tmpl | 27 +- template/en/default/attachment/created.html.tmpl | 16 +- template/en/default/attachment/diff-file.html.tmpl | 42 +- .../en/default/attachment/diff-footer.html.tmpl | 3 + .../en/default/attachment/diff-header.html.tmpl | 2 + template/en/default/attachment/edit.html.tmpl | 307 ++--- template/en/default/attachment/list.html.tmpl | 8 +- .../en/default/attachment/show-multiple.html.tmpl | 3 +- template/en/default/attachment/updated.html.tmpl | 20 +- template/en/default/bug/activity/show.html.tmpl | 4 +- template/en/default/bug/activity/table.html.tmpl | 72 +- template/en/default/bug/comments.html.tmpl | 44 +- .../en/default/bug/create/create-guided.html.tmpl | 2 + template/en/default/bug/create/create.html.tmpl | 57 +- template/en/default/bug/create/created.html.tmpl | 14 +- template/en/default/bug/dependency-tree.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 386 +++---- template/en/default/bug/field.html.tmpl | 7 +- template/en/default/bug/format_comment.txt.tmpl | 46 +- template/en/default/bug/knob.html.tmpl | 127 +-- template/en/default/bug/navigate.html.tmpl | 25 +- template/en/default/bug/process/bugmail.html.tmpl | 21 +- template/en/default/bug/process/header.html.tmpl | 8 +- template/en/default/bug/process/midair.html.tmpl | 5 +- template/en/default/bug/process/results.html.tmpl | 2 - .../bug/process/verify-new-product.html.tmpl | 2 + template/en/default/bug/show-header.html.tmpl | 50 + template/en/default/bug/show-multiple.html.tmpl | 20 +- template/en/default/bug/show.html.tmpl | 24 +- template/en/default/bug/show.xml.tmpl | 64 +- template/en/default/bug/summarize-time.html.tmpl | 2 +- template/en/default/bug/votes/delete-all.html.tmpl | 1 + .../en/default/bug/votes/list-for-user.html.tmpl | 3 +- template/en/default/config.rdf.tmpl | 93 +- template/en/default/email/lockout.txt.tmpl | 39 + template/en/default/email/newchangedmail.txt.tmpl | 6 +- template/en/default/email/whine.txt.tmpl | 12 +- template/en/default/extensions/config.pm.tmpl | 41 + template/en/default/extensions/extension.pm.tmpl | 46 + .../en/default/extensions/hook-readme.txt.tmpl | 27 + template/en/default/extensions/license.txt.tmpl | 47 + .../en/default/extensions/name-readme.txt.tmpl | 38 + template/en/default/extensions/util.pm.tmpl | 42 + template/en/default/filterexceptions.pl | 38 +- template/en/default/flag/list.html.tmpl | 225 ++--- .../en/default/global/choose-product.html.tmpl | 8 +- template/en/default/global/code-error.html.tmpl | 150 ++- template/en/default/global/common-links.html.tmpl | 11 +- .../en/default/global/confirm-user-match.html.tmpl | 39 +- template/en/default/global/field-descs.none.tmpl | 201 ++-- template/en/default/global/footer.html.tmpl | 6 +- template/en/default/global/header.html.tmpl | 40 +- template/en/default/global/messages.html.tmpl | 103 ++- .../en/default/global/per-bug-queries.html.tmpl | 2 +- .../en/default/global/site-navigation.html.tmpl | 26 - template/en/default/global/tabs.html.tmpl | 8 +- template/en/default/global/textarea.html.tmpl | 2 + template/en/default/global/user-error.html.tmpl | 234 +++-- template/en/default/index.html.tmpl | 17 +- template/en/default/list/edit-multiple.html.tmpl | 28 +- template/en/default/list/list.atom.tmpl | 18 +- template/en/default/list/list.csv.tmpl | 4 +- template/en/default/list/list.html.tmpl | 62 +- template/en/default/list/list.ics.tmpl | 1 + template/en/default/list/quips.html.tmpl | 7 +- template/en/default/list/table.html.tmpl | 109 +- template/en/default/pages/bug-writing.html.tmpl | 4 +- template/en/default/pages/fields.html.tmpl | 101 +- template/en/default/pages/quicksearch.html.tmpl | 365 ++++--- .../en/default/pages/quicksearchhack.html.tmpl | 387 ------ template/en/default/pages/release-notes.html.tmpl | 1261 +++++++++++++++++--- template/en/default/reports/components.html.tmpl | 63 +- template/en/default/reports/create-chart.html.tmpl | 24 +- .../en/default/reports/delete-series.html.tmpl | 59 + .../en/default/reports/duplicates-simple.html.tmpl | 18 +- .../en/default/reports/duplicates-table.html.tmpl | 166 ++-- template/en/default/reports/duplicates.html.tmpl | 70 +- template/en/default/reports/edit-series.html.tmpl | 8 +- template/en/default/reports/menu.html.tmpl | 54 +- template/en/default/reports/old-charts.html.tmpl | 2 +- template/en/default/reports/report-bar.png.tmpl | 24 +- template/en/default/reports/report-line.png.tmpl | 24 +- template/en/default/reports/report-pie.png.tmpl | 12 +- template/en/default/reports/report-table.csv.tmpl | 8 +- template/en/default/reports/report-table.html.tmpl | 8 +- template/en/default/request/email.txt.tmpl | 21 +- template/en/default/request/queue.html.tmpl | 70 +- .../en/default/search/boolean-charts.html.tmpl | 1 + template/en/default/search/form.html.tmpl | 62 +- .../default/search/search-create-series.html.tmpl | 1 + .../en/default/search/search-specific.html.tmpl | 2 +- template/en/default/search/tabs.html.tmpl | 2 +- template/en/default/setup/strings.txt.pl | 33 +- template/en/default/welcome-admin.html.tmpl | 9 +- template/en/default/whine/mail.html.tmpl | 10 +- template/en/default/whine/mail.txt.tmpl | 10 +- template/en/default/whine/schedule.html.tmpl | 10 + template/en/extension/filterexceptions.pl | 42 - testserver.pl | 16 +- token.cgi | 16 +- userprefs.cgi | 52 +- votes.cgi | 9 +- whine.pl | 20 +- xmlrpc.cgi | 13 +- 367 files changed, 18756 insertions(+), 12280 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=afec5e31f59d964e6…

1 0

Andrew Eikum : dsound: Don't dereference a freed object.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: e2cc32d252c01f3b00ef02a2084a810a082ff0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cc32d252c01f3b00ef02a20… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 21 11:25:27 2011 -0500 dsound: Don't dereference a freed object. --- dlls/dsound/sound3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index a820c51..e64cd43 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -787,9 +787,9 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(LPDIRECTSOUND3DLISTENER i if (!ref) { This->device->listener = 0; - HeapFree(GetProcessHeap(), 0, This); if (!InterlockedDecrement(&This->device->primary->numIfaces)) primarybuffer_destroy(This->device->primary); + HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } return ref;

1 0

Octavian Voicu : oleaut32: Add tmarshal test with variant array and fix variant marshalled size calculation .
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 74a3d9ee5eff36b6fa4283cbc29b9cd13d4cb09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a3d9ee5eff36b6fa4283cbc… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Sep 21 18:37:22 2011 +0300 oleaut32: Add tmarshal test with variant array and fix variant marshalled size calculation. --- dlls/oleaut32/tests/tmarshal.c | 47 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 ++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/tmarshal.c | 2 +- 4 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index c84aa47..c2fa3b4 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -475,6 +475,40 @@ static HRESULT WINAPI Widget_VariantArrayPtr( return S_OK; } +static HRESULT WINAPI Widget_VariantCArray( + IWidget * iface, + ULONG count, + VARIANT values[]) +{ + ULONG i; + VARIANT inc, res; + HRESULT hr; + + trace("VariantCArray(%u,%p)\n", count, values); + + ok(count == 2, "count is %d\n", count); + for (i = 0; i < count; i++) + ok(V_VT(&values[i]) == VT_I4, "values[%d] is not VT_I4\n", i); + + V_VT(&inc) = VT_I4; + V_I4(&inc) = 1; + for (i = 0; i < count; i++) { + VariantInit(&res); + hr = VarAdd(&values[i], &inc, &res); + if (!SUCCEEDED(hr)) { + ok(0, "VarAdd failed at %u with error 0x%x\n", i, hr); + return hr; + } + hr = VariantCopy(&values[i], &res); + if (!SUCCEEDED(hr)) { + ok(0, "VariantCopy failed at %u with error 0x%x\n", i, hr); + return hr; + } + } + + return S_OK; +} + static HRESULT WINAPI Widget_Variant( IWidget __RPC_FAR * iface, VARIANT var) @@ -640,6 +674,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Value, Widget_Array, Widget_VariantArrayPtr, + Widget_VariantCArray, Widget_Variant, Widget_VarArg, Widget_StructArgs, @@ -1230,6 +1265,18 @@ static void test_typelibmarshal(void) ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + /* call VariantCArray - test marshaling of variant arrays */ + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 1; + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = 2; + hr = IWidget_VariantCArray(pWidget, 2, vararg); + ok_ole_success(hr, IWidget_VariantCArray); + todo_wine + ok(V_VT(&vararg[0]) == VT_I4 && V_I4(&vararg[0]) == 2, "vararg[0] = %d[%d]\n", V_VT(&vararg[0]), V_I4(&vararg[0])); + todo_wine + ok(V_VT(&vararg[1]) == VT_I4 && V_I4(&vararg[1]) == 3, "vararg[1] = %d[%d]\n", V_VT(&vararg[1]), V_I4(&vararg[1])); + /* call VarArg */ VariantInit(&vararg[3]); V_VT(&vararg[3]) = VT_I4; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 7616789..30b6d8f 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -111,6 +111,9 @@ library TestTypelib [id(DISPID_TM_VARARRAYPTR)] HRESULT VariantArrayPtr([in] SAFEARRAY(VARIANT) *values); + [id(DISPID_TM_VARCARRAY)] + HRESULT VariantCArray([in] ULONG count, [in, out] VARIANT values[2]); + [id(DISPID_TM_VARIANT)] HRESULT Variant([in] VARIANT var); diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 376162b..0e49505 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -40,6 +40,7 @@ #define DISPID_TM_BYREF_UINT 21 #define DISPID_TM_PROP_OPT_ARG 22 #define DISPID_TM_PROP_REQ_ARG 23 +#define DISPID_TM_VARCARRAY 24 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2 diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 25f0a0a..1549d97 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -597,7 +597,7 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { case VT_CY: return sizeof(CY); case VT_VARIANT: - return sizeof(VARIANT)+3; /* FIXME: why the +3? */ + return sizeof(VARIANT); case VT_CARRAY: { int i, arrsize = 1; const ARRAYDESC *adesc = td->u.lpadesc;

1 0

Francois Gouget : msxml3: Fix printing NULL strings.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 55a6db89121f21327c48b6ef2dcc3de3998c29b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a6db89121f21327c48b6ef2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 16:45:11 2011 +0200 msxml3: Fix printing NULL strings. --- dlls/msxml3/element.c | 8 ++++---- dlls/msxml3/httprequest.c | 4 ++-- dlls/msxml3/main.c | 4 ++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 9 +++++++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index f84dcb5..6cd3a6d 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -663,7 +663,7 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) case DT_IDREF: case DT_IDREFS: case DT_NOTATION: - FIXME("need to handle dt:%s\n", dt_to_str(dt)); + FIXME("need to handle dt:%s\n", debugstr_dt(dt)); V_VT(v) = VT_BSTR; V_BSTR(v) = bstr_from_xmlChar(str); if (!V_BSTR(v)) @@ -729,7 +729,7 @@ static XDR_DT element_get_dt(xmlNodePtr node) } } - TRACE("=> dt:%s\n", dt_to_str(dt)); + TRACE("=> dt:%s\n", debugstr_dt(dt)); return dt; } @@ -786,7 +786,7 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( } else { - FIXME("not implemented for dt:%s\n", dt_to_str(dt)); + FIXME("not implemented for dt:%s\n", debugstr_dt(dt)); return E_NOTIMPL; } @@ -934,7 +934,7 @@ static HRESULT WINAPI domelem_put_dataType( } break; default: - FIXME("need to handle dt:%s\n", dt_to_str(dt)); + FIXME("need to handle dt:%s\n", debugstr_dt(dt)); break; } } diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 8203129..0265c1a 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -888,12 +888,12 @@ static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR if (size >= 4) { encoding = xmlDetectCharEncoding(ptr, 4); - TRACE("detected encoding: %s\n", xmlGetCharEncodingName(encoding)); + TRACE("detected encoding: %s\n", debugstr_a(xmlGetCharEncodingName(encoding))); if ( encoding != XML_CHAR_ENCODING_UTF8 && encoding != XML_CHAR_ENCODING_UTF16LE && encoding != XML_CHAR_ENCODING_NONE ) { - FIXME("unsupported encoding: %s\n", xmlGetCharEncodingName(encoding)); + FIXME("unsupported encoding: %s\n", debugstr_a(xmlGetCharEncodingName(encoding))); GlobalUnlock(hglobal); return E_FAIL; } diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 2363008..c4e4303 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -105,7 +105,7 @@ void wineXmlCallbackError(char const* caller, xmlErrorPtr err) case XML_ERR_WARNING: dbcl = __WINE_DBCL_WARN; break; default: dbcl = __WINE_DBCL_ERR; break; } - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", err->message); + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", debugstr_a(err->message)); } /* Support for loading xml files from a Wine Windows drive */ @@ -288,7 +288,7 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); case VT_BSTR|VT_BYREF: return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", - V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w(*V_BSTRREF(v)) : NULL); + V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e7f82ea..bc90c99 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -333,6 +333,7 @@ extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodeP extern XDR_DT str_to_dt(xmlChar const* str, int len /* calculated if -1 */) DECLSPEC_HIDDEN; extern XDR_DT bstr_to_dt(OLECHAR const* bstr, int len /* calculated if -1 */) DECLSPEC_HIDDEN; extern xmlChar const* dt_to_str(XDR_DT dt) DECLSPEC_HIDDEN; +extern const char* debugstr_dt(XDR_DT dt) DECLSPEC_HIDDEN; extern OLECHAR const* dt_to_bstr(XDR_DT dt) DECLSPEC_HIDDEN; extern HRESULT dt_validate(XDR_DT dt, xmlChar const* content) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 8f2acb4..1c5255b 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -573,6 +573,11 @@ OLECHAR const* dt_to_bstr(XDR_DT dt) return DT_wstring_table[dt]; } +const char* debugstr_dt(XDR_DT dt) +{ + return debugstr_a(dt != DT_INVALID ? (const char*)DT_string_table[dt] : NULL); +} + HRESULT dt_validate(XDR_DT dt, xmlChar const* content) { xmlDocPtr tmp_doc; @@ -580,7 +585,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) xmlNsPtr ns; HRESULT hr; - TRACE("(dt:%s, %s)\n", dt_to_str(dt), wine_dbgstr_a((char const*)content)); + TRACE("(dt:%s, %s)\n", debugstr_dt(dt), wine_dbgstr_a((char const*)content)); if (!datatypes_schema) { @@ -650,7 +655,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) } return hr; default: - FIXME("need to handle dt:%s\n", dt_to_str(dt)); + FIXME("need to handle dt:%s\n", debugstr_dt(dt)); return S_OK; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011