September 2011 - Wine-Commits

Alexandre Julliard : gdi32: Copy bits in the correct order for the overlap case in the individual copy_rect functions .
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 7bcd8fa20e99e4db61078846a441c0a126b31d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcd8fa20e99e4db61078846a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 09:57:58 2011 +0200 gdi32: Copy bits in the correct order for the overlap case in the individual copy_rect functions. --- dlls/gdi32/dibdrv/bitblt.c | 10 +- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/primitives.c | 378 ++++++++++++++++++++++++++-------------- 3 files changed, 253 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bcd8fa20e99e4db61078…

1 0

Henri Verbeet : winealsa.drv: Use the plughw instead of the hw interface for opening devices.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

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 Sept. 22, 2011

Sept. 22, 2011

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

Alexandre Julliard : gdi32/tests: Add some tests for overlapping blits.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 0e91f9990ea9aea9d2eb1750cc6a160d59c70b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e91f9990ea9aea9d2eb1750c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 13:14:08 2011 +0200 gdi32/tests: Add some tests for overlapping blits. --- dlls/gdi32/tests/dib.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index a1c9d27..d2da1c9 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -103,6 +103,15 @@ static const char *sha1_graphics_a8r8g8b8[] = "7da9dd3d40d44d92deb9883fb7110443c2d5769a", "e358efb1c11172e40855de620bdb8a8e545cd790", "9e0c2596c6ecb4f1bc97b18ec3ca493d37626608", + "58806549380c964e7a53ad54821d2eb86fa5b9ce", + "7fc30d3058c235ce39088de0a598b8c7fe7ca61f", + "52a6c769c227f2bb1949097c4c87fed5ee0cbcb1", + "8a010d4c5af51fcc34d51be3197878782bdf63e7", + "c84c2c33e22eb7e5c4a2faad3b3b99a359d77528", + "41bcc1f57c60bdec3c4d1e749084a12867f91224", + "94645300d6eb51020a7ef8261dee2941cd51b5df", + "c56f5bdc9cac4f0bc81c33295d9aed8eaf4cb1f2", + "21cdfde38ac7edbb241ec83d82f31286e90c4629", NULL }; @@ -135,6 +144,15 @@ static const char *sha1_graphics_a8b8g8r8[] = "abdf003699364fe45fab7dc61e67c606d0063b40", "89abaadff4e68c738cf9251c51e3609564843381", "f6aa3f907f620b9f3493f03cb3b4b292df3a9545", + "77d0ad32938147aa4038c1eced232b7b5a5f88f3", + "43d36e57b702ce56eb250bf53f1ecc4680990cfe", + "fd6e0ebb52710ebcdd8dd69931165c83c4930b41", + "71b9756fdfeedce1e6db201176d21a981b881662", + "5319528d9af750c172ae62ee85ddb2eaef73b193", + "b7ce8aa3c328eedaed7306234ed9bae67708e627", + "19b32a0daa91201725b5e13820c343d0a84ff698", + "abca6a80a99b05722d2d87ce2a8b94ef1ae549e1", + "2ba70994d0b4ce87fdf6fbc33ada11252178061e", NULL }; @@ -167,6 +185,15 @@ static const char *sha1_graphics_24[] = "e649e00efe7fea1eb8b17f7867fe089e5270c44b", "a0bffbbfb0adf6f188479c88da04e25d76ab4822", "92a1ab214dd8027c407814420449119466c92840", + "b58f19c1800344a2b8e017eb784705bdb2bd8450", + "5747a6d5c6ce79731c55e8cf33f7da3025cd35fd", + "955390669afed2369b15b32fa519f2f921cdf1a0", + "201906f7d763b930a98c97f8eeab417f2b65e723", + "5313357d50c40c05a3b3a83d0d2013a138c955a1", + "701c5af1d0c28294ce7d804b5697643c430d22a0", + "b0a959745b2db1d9f449e68e4479a4f36301879c", + "63f764b9bd2f4876ab1ee0f3c0eb55b5a7de5212", + "e171f6ec77bca91d6b8559911bce296c0bac469e", NULL }; @@ -199,6 +226,14 @@ static const char *sha1_graphics_r5g5b5[] = "ecc2991277d7314f55b00e0f284ae3703aeef81e", "656bf3b7121bcd620a0a3ad488f0d66604824577", "d7d8493b5fa7a3a8323d6ac84245093a79f052c1", + "df5dafe96e528c2cc7fd11e4934e298f53cec34b", + "a49530722328ae88fd765792ac0c657efbcce75d", + "aa46aa2226e3121eaefa9d0836418e0b69262d69", + "333f3f2cf3ff15736d59f92a33c45323d3987d6d", + "a6fd83542c3826132e88d3f5e304d604c0056fad", + "a8d6a5285a927ba3a3be34b06a06c70a20d4c1b3", + "e428d213ad02651287894f093413949dcb369208", + "7df915bedcc5951a1b6f828490f7dbb93212e835", NULL }; @@ -231,6 +266,14 @@ static const char *sha1_graphics_r4g4b4[] = "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", "8933450132bf949ba4bc28626968425b5ed2867d", "9928a8f28a66c00069a124f7171b248817005763", + "e4a9dcc3e565cd3a6b7087dd1433f3898bb9cdb2", + "eca4f9b16b3bddfd0735fdd792e0ccaadfb9ba49", + "233e588cf660e2c9b552cf02065cf63fa6655864", + "0740ff74dcd259d9a644ba51ad77ff0d40348951", + "a3345acaf272f2e288626906e3056cd0ced70499", + "957a86fbe8a96dd068db65e4e624a52bcc84af46", + "13b0f240054dc57ba0e2dfde74048496304a2c7f", + "51ef267eb9c15487c9430f505e8a6c929eb2170c", NULL }; @@ -263,6 +306,14 @@ static const char *sha1_graphics_8[] = "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", "c4efce8f7ed2d380ea5dc6fe1ef8448a27827532", "bdc0a354635b879871077c5b712570e469863c99", + "d599bf210423fe3adbb4f1de87d9360de97827d0", + "bae7c8b789e4e9b336c03c4daee3bce63fe039d9", + "cc01f17928f7780cefd423ea653b072eea723a1b", + "c005662a47f14c2f1b7c7fb3b0ef0fc390c6ea6a", + "675cde16a6ad2bcd8d7e72780b07a0ccd8d0393a", + "ea39ac62ca2f815a1d029340c6465994b6f03cb0", + "9a603513cd81acf70cf8b27b0d544e7f672e9d40", + "f4a334e69535de74ee5ed54be93a75120a66e54a", NULL }; @@ -295,6 +346,14 @@ static const char *sha1_graphics_4[] = "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", "4f827ca6927f15191588456f985bf29d2a3b3c24", "e7de769c3d12ea9dd223bef4881c578823bec67e", + "6fb102d020e5554116feefc8482104f3ae2036d2", + "ae546ffd30b837afc7dfcb5c9ce4f01d15b35ddc", + "20c9eb3276c08fdce35755e349bec94b04929812", + "628d837163a25c6520f19c0602383176dbad528e", + "b5a12cff7100290ad43f5ed17a321b42de048893", + "b672afbeeafb44194a821f0def81a8892872937e", + "db0124045882b598feea192186cf7eb7a0387866", + "602d91471378fe24a2d0248bd8a92b624f099fea", NULL }; @@ -340,6 +399,16 @@ static const char *sha1_graphics_1[] = "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", "f2fe295317e795a88edd0b2c52618b8cb0e7f2ce", "ffc78c075d4be66806f6c59180772d5eed963dc0", + "c86eeaeed09871dee4b43722ba512d2d3af7f4d0", + "24b1a6241c81dbb950cfbe5da6798fd59eb36266", + "1007d3b531b4bc3553d4547bc88443fc1f497cf6", + "b71ca46be287598f716bb04fac0a52ad139c70db", + "6589e48498e30ab036fbfe94d73427b2b1238a69", + "4dce919117d2e41df9f5d4d0de14f97ae650046d", + "22c2e078f69d73b7a5cb3f7dcbb8fbaa007ef3ac", + "be36cda370650e6d5fb0570aeb8ced491d0c2b1c", + "4c34cb8e47f9ff4b4348aa2d40cce7cb54d65cb0", + "18f4497e43903e8df5b27da4ceebf62b15550a87", NULL }; @@ -1001,6 +1070,83 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash_broken_todo(bmi, bits, sha1, "hatch brushes", 1, FALSE); /* nt4 is different */ memset(bits, 0xcc, dib_size); + /* overlapping blits */ + + orig_brush = SelectObject(hdc, solid_brush); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 20, 100, 100, hdc, 10, 10, SRCCOPY ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY +x, +y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 10, 100, 100, hdc, 20, 20, SRCCOPY ); + if (bmi->bmiHeader.biBitCount == 1) /* Windows gets this one wrong */ + compare_hash_broken_todo(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, -y",1, FALSE); + else + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 10, 100, 100, hdc, 10, 20, SRCCOPY ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY +x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 20, 100, 100, hdc, 20, 10, SRCCOPY ); + if (bmi->bmiHeader.biBitCount == 1) /* Windows gets this one wrong */ + compare_hash_broken_todo(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, +y", 1, FALSE ); + else + compare_hash(bmi, bits, sha1, "overlapping BitBlt SRCCOPY -x, +y" ); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 20, 100, 100, hdc, 10, 10, PATPAINT ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT +x, +y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 10, 100, 100, hdc, 20, 20, PATPAINT ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT -x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 20, 10, 100, 100, hdc, 10, 20, PATPAINT ); + if (bmi->bmiHeader.biBitCount >= 24) /* Windows gets this one wrong */ + compare_hash_broken_todo(bmi, bits, sha1, "overlapping BitBlt PATPAINT +x, -y", 1, FALSE); + else + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT +x, -y"); + memset(bits, 0xcc, dib_size); + + Rectangle(hdc, 10, 10, 100, 100); + Rectangle(hdc, 20, 15, 30, 40); + Rectangle(hdc, 15, 15, 20, 20); + Rectangle(hdc, 15, 20, 50, 45); + BitBlt( hdc, 10, 20, 100, 100, hdc, 20, 10, PATPAINT ); + compare_hash(bmi, bits, sha1, "overlapping BitBlt PATPAINT -x, +y" ); + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.6.6.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

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 Sept. 22, 2011

Sept. 22, 2011

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 Sept. 22, 2011

Sept. 22, 2011

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

Alistair Leslie-Hughes : mshtml: Add IHTMLTable2/3 support.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: d70b967d60e443da6d8f84d510b3a662567ff73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d70b967d60e443da6d8f84d51… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 21 16:37:34 2011 +1000 mshtml: Add IHTMLTable2/3 support. --- dlls/mshtml/htmltable.c | 199 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 202 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 61cde80..7490d98 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -34,7 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLTable { HTMLElement element; - IHTMLTable IHTMLTable_iface; + IHTMLTable IHTMLTable_iface; + IHTMLTable2 IHTMLTable2_iface; + IHTMLTable3 IHTMLTable3_iface; ConnectionPoint cp; nsIDOMHTMLTableElement *nstable; @@ -45,6 +47,16 @@ static inline HTMLTable *impl_from_IHTMLTable(IHTMLTable *iface) return CONTAINING_RECORD(iface, HTMLTable, IHTMLTable_iface); } +static inline HTMLTable *impl_from_IHTMLTable2(IHTMLTable2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLTable, IHTMLTable2_iface); +} + +static inline HTMLTable *impl_from_IHTMLTable3(IHTMLTable3 *iface) +{ + return CONTAINING_RECORD(iface, HTMLTable, IHTMLTable3_iface); +} + static HRESULT WINAPI HTMLTable_QueryInterface(IHTMLTable *iface, REFIID riid, void **ppv) { @@ -515,6 +527,185 @@ static const IHTMLTableVtbl HTMLTableVtbl = { HTMLTable_get_onreadystatechange }; +/* IHTMLTable2 */ +static HRESULT WINAPI HTMLTable2_QueryInterface(IHTMLTable2 *iface, + REFIID riid, void **ppv) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLTable2_AddRef(IHTMLTable2 *iface) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLTable2_Release(IHTMLTable2 *iface) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLTable2_GetTypeInfoCount(IHTMLTable2 *iface, UINT *pctinfo) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLTable2_GetTypeInfo(IHTMLTable2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI HTMLTable2_GetIDsOfNames(IHTMLTable2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLTable2_Invoke(IHTMLTable2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLTable2_firstPage(IHTMLTable2 *iface) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTable2_lastPage(IHTMLTable2 *iface) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTable2_cells(IHTMLTable2 *iface, IHTMLElementCollection **p) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTable2_moveRow(IHTMLTable2 *iface, LONG indexFrom, LONG indexTo, IDispatch **row) +{ + HTMLTable *This = impl_from_IHTMLTable2(iface); + FIXME("(%p)->(%d %d %p)\n", This, indexFrom, indexTo, row); + return E_NOTIMPL; +} + + +static const IHTMLTable2Vtbl HTMLTable2Vtbl = { + HTMLTable2_QueryInterface, + HTMLTable2_AddRef, + HTMLTable2_Release, + HTMLTable2_GetTypeInfoCount, + HTMLTable2_GetTypeInfo, + HTMLTable2_GetIDsOfNames, + HTMLTable2_Invoke, + HTMLTable2_firstPage, + HTMLTable2_lastPage, + HTMLTable2_cells, + HTMLTable2_moveRow +}; + +/* IHTMLTable3 */ +static HRESULT WINAPI HTMLTable3_QueryInterface(IHTMLTable3 *iface, + REFIID riid, void **ppv) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLTable3_AddRef(IHTMLTable3 *iface) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLTable3_Release(IHTMLTable3 *iface) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLTable3_GetTypeInfoCount(IHTMLTable3 *iface, UINT *pctinfo) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLTable3_GetTypeInfo(IHTMLTable3 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI HTMLTable3_GetIDsOfNames(IHTMLTable3 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLTable3_Invoke(IHTMLTable3 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLTable3_put_summary(IHTMLTable3 *iface, BSTR v) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTable3_get_summary(IHTMLTable3 *iface, BSTR * p) +{ + HTMLTable *This = impl_from_IHTMLTable3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLTable3Vtbl HTMLTable3Vtbl = { + HTMLTable3_QueryInterface, + HTMLTable3_AddRef, + HTMLTable3_Release, + HTMLTable3_GetTypeInfoCount, + HTMLTable3_GetTypeInfo, + HTMLTable3_GetIDsOfNames, + HTMLTable3_Invoke, + HTMLTable3_put_summary, + HTMLTable3_get_summary +}; + static inline HTMLTable *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLTable, element.node); @@ -535,6 +726,12 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLTable, riid)) { TRACE("(%p)->(IID_IHTMLTable %p)\n", This, ppv); *ppv = &This->IHTMLTable_iface; + }else if(IsEqualGUID(&IID_IHTMLTable2, riid)) { + TRACE("(%p)->(IID_IHTMLTable2 %p)\n", This, ppv); + *ppv = &This->IHTMLTable_iface; + }else if(IsEqualGUID(&IID_IHTMLTable3, riid)) { + TRACE("(%p)->(IID_IHTMLTable3 %p)\n", This, ppv); + *ppv = &This->IHTMLTable_iface; } if(*ppv) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7b759e0..7be212e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -162,6 +162,8 @@ typedef struct event_target_t event_target_t; XIID(IHTMLStyleElement) \ XIID(IHTMLStyleSheetsCollection) \ XIID(IHTMLTable) \ + XIID(IHTMLTable2) \ + XIID(IHTMLTable3) \ XIID(IHTMLTableRow) \ XIID(IHTMLTextAreaElement) \ XIID(IHTMLTextContainer) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 107fbb5..4a2a7ac 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -213,6 +213,8 @@ static const IID * const option_iids[] = { static const IID * const table_iids[] = { ELEM_IFACES, &IID_IHTMLTable, + &IID_IHTMLTable2, + &IID_IHTMLTable3, &IID_IConnectionPointContainer, NULL };

1 0

Jacek Caban : vbscript: Added interp_const implementation.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: 6cbf3e3b3c0a566c35ae168efabf5939264ff081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbf3e3b3c0a566c35ae168ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 21 14:04:16 2011 +0200 vbscript: Added interp_const implementation. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 38 +++++++++++++++++++++++++++++++------- dlls/vbscript/vbscript.h | 1 + 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 712d97d..9cfe45b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -921,6 +921,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f return E_OUTOFMEMORY; V_VT(&new_var->v) = VT_EMPTY; + new_var->is_const = FALSE; new_var->next = ctx->global_vars; ctx->global_vars = new_var; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 46d15ff..c2ffd98 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -24,7 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); - typedef struct { vbscode_t *code; instr_t *instr; @@ -52,6 +51,7 @@ typedef enum { REF_DISP, REF_VAR, REF_OBJ, + REF_CONST, REF_FUNC } ref_type_t; @@ -78,7 +78,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re { while(var) { if(!strcmpiW(var->name, name)) { - ref->type = REF_VAR; + ref->type = var->is_const ? REF_CONST : REF_VAR; ref->u.v = &var->v; return TRUE; } @@ -198,7 +198,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } -static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, VARIANT *val, BOOL own_val) +static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT *val, BOOL own_val) { dynamic_var_t *new_var; vbsheap_t *heap; @@ -218,6 +218,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, VARIANT *val, return E_OUTOFMEMORY; memcpy(str, name, size); new_var->name = str; + new_var->is_const = is_const; if(own_val) { new_var->v = *val; @@ -379,6 +380,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) switch(ref.type) { case REF_VAR: + case REF_CONST: if(!res) { FIXME("REF_VAR no res\n"); return E_NOTIMPL; @@ -531,13 +533,16 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v case REF_OBJ: FIXME("REF_OBJ\n"); return E_NOTIMPL; + case REF_CONST: + FIXME("REF_CONST\n"); + return E_NOTIMPL; case REF_NONE: if(ctx->func->code_ctx->option_explicit) { FIXME("throw exception\n"); hres = E_FAIL; }else { TRACE("creating variable %s\n", debugstr_w(name)); - hres = add_dynamic_var(ctx, name, val, own_val); + hres = add_dynamic_var(ctx, name, FALSE, val, own_val); } } @@ -653,8 +658,28 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) static HRESULT interp_const(exec_ctx_t *ctx) { BSTR arg = ctx->instr->arg1.bstr; - FIXME("%s\n", debugstr_w(arg)); - return E_NOTIMPL; + variant_val_t val; + ref_t ref; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + assert(ctx->func->type == FUNC_GLOBAL); + + hres = lookup_identifier(ctx, arg, VBDISP_CALLGET, &ref); + if(FAILED(hres)) + return hres; + + if(ref.type != REF_NONE) { + FIXME("%s already defined\n", debugstr_w(arg)); + return E_FAIL; + } + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned); } static HRESULT interp_new(exec_ctx_t *ctx) @@ -1547,6 +1572,5 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI } release_exec(&exec); - return hres; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 73b0b86..bd55719 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -136,6 +136,7 @@ typedef struct _dynamic_var_t { struct _dynamic_var_t *next; VARIANT v; const WCHAR *name; + BOOL is_const; } dynamic_var_t; struct _script_ctx_t {

1 0

Jacek Caban : vbscript: Added const statement tests.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: e9ad716a3436d7653169e2432c71530a9cc8e7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ad716a3436d7653169e2432… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 21 14:04:30 2011 +0200 vbscript: Added const statement tests. --- dlls/vbscript/tests/lang.vbs | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 7c64adf..2d712f5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -688,4 +688,22 @@ Call obj.test(obj) Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) Call ok(Me is Test, "Me is not Test") +Const c1 = 1, c2 = 2 +Call ok(c1 = 1, "c1 = " & c1) +Call ok(getVT(c1) = "VT_I2", "getVT(c1) = " & getVT(c1)) + +if false then Const conststr = "str" +Call ok(conststr = "str", "conststr = " & conststr) +Call ok(getVT(conststr) = "VT_BSTR", "getVT(conststr) = " & getVT(conststr)) +Call ok(conststr = "str", "conststr = " & conststr) + +Sub ConstTestSub + Const funcconst = 1 + Call ok(c1 = 1, "c1 = " & c1) + Call ok(funcconst = 1, "funcconst = " & funcconst) +End Sub + +Call ConstTestSub +Dim funcconst + reportSuccess()

1 0