wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Michael Stefaniuc : d3dx9_36/tests: Avoid using fmaxf.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 49064869595a8d0c97a79055eb1a2b1128c2c7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49064869595a8d0c97a79055e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 00:41:59 2011 +0200 d3dx9_36/tests: Avoid using fmaxf. --- dlls/d3dx9_36/tests/mesh.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6a78e64..e516961 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -6169,7 +6169,7 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number { D3DXVECTOR2 *got = (D3DXVECTOR2*)(got_ptr + decl_ptr->Offset); D3DXVECTOR2 *exp = (D3DXVECTOR2*)(exp_ptr + decl_ptr->Offset); - FLOAT diff = fmaxf(fabsf(got->x - exp->x), fabsf(got->y - exp->y)); + FLOAT diff = max(fabsf(got->x - exp->x), fabsf(got->y - exp->y)); ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got (%f, %f) for vertex %d %s, expected (%f, %f).\n", mesh_number, got->x, got->y, vertex_number, usage_strings[decl_ptr->Usage], exp->x, exp->y); break; @@ -6178,8 +6178,8 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number { D3DXVECTOR3 *got = (D3DXVECTOR3*)(got_ptr + decl_ptr->Offset); D3DXVECTOR3 *exp = (D3DXVECTOR3*)(exp_ptr + decl_ptr->Offset); - FLOAT diff = fmaxf(fabsf(got->x - exp->x), fabsf(got->y - exp->y)); - diff = fmaxf(diff, fabsf(got->z - exp->z)); + FLOAT diff = max(fabsf(got->x - exp->x), fabsf(got->y - exp->y)); + diff = max(diff, fabsf(got->z - exp->z)); ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got (%f, %f, %f) for vertex %d %s, expected (%f, %f, %f).\n", mesh_number, got->x, got->y, got->z, vertex_number, usage_strings[decl_ptr->Usage], exp->x, exp->y, exp->z); break; @@ -6188,9 +6188,9 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number { D3DXVECTOR4 *got = (D3DXVECTOR4*)(got_ptr + decl_ptr->Offset); D3DXVECTOR4 *exp = (D3DXVECTOR4*)(exp_ptr + decl_ptr->Offset); - FLOAT diff = fmaxf(fabsf(got->x - exp->x), fabsf(got->y - exp->y)); - diff = fmaxf(diff, fabsf(got->z - exp->z)); - diff = fmaxf(diff, fabsf(got->w - exp->w)); + FLOAT diff = max(fabsf(got->x - exp->x), fabsf(got->y - exp->y)); + diff = max(diff, fabsf(got->z - exp->z)); + diff = max(diff, fabsf(got->w - exp->w)); ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got (%f, %f, %f, %f) for vertex %d %s, expected (%f, %f, %f, %f).\n", mesh_number, got->x, got->y, got->z, got->w, vertex_number, usage_strings[decl_ptr->Usage], exp->x, exp->y, exp->z, got->w); break;

1 0

Francois Gouget : Assorted spelling fixes & co.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: bd7b345b26976350e7eda4eee28a8da5a7f3e8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7b345b26976350e7eda4eee… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 27 00:14:10 2011 +0200 Assorted spelling fixes & co. --- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/status.c | 2 +- dlls/comctl32/tests/treeview.c | 6 +++--- dlls/kernel32/tests/sync.c | 4 ++-- dlls/quartz/tests/avisplitter.c | 18 +++++++++--------- dlls/shlwapi/string.c | 2 +- dlls/shlwapi/tests/ordinal.c | 4 ++-- programs/winemenubuilder/winemenubuilder.c | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 5efe940..88c931c 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -1115,7 +1115,7 @@ START_TEST(rebar) init_system_font_height(); - /* LoadLibrary is needed. This file has no references to functions in comctl32 */ + /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ hComctl32 = LoadLibraryA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 0eaae59..6e5a3e7 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -460,7 +460,7 @@ static void test_status_ownerdraw(void) r = SendMessage(hWndStatus, SB_SETTEXT, SBT_OWNERDRAW, (LPARAM)statustext); ok( r == TRUE, "Sendmessage returned %d, expected 1\n", r); ok( 1 == g_wmdrawitm_ctr, "got %d drawitem messages expected 1\n", g_wmdrawitm_ctr); - /* ;and again */ + /* and again */ g_wmdrawitm_ctr = 0; r = SendMessage(hWndStatus, SB_SETTEXT, SBT_OWNERDRAW, (LPARAM)statustext); ok( r == TRUE, "Sendmessage returned %d, expected 1\n", r); diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 588a5ca..fd4a6ce 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1129,7 +1129,7 @@ static void test_expandinvisible(void) hTree = create_treeview_control(0); - /* The test builds the following tree and expands then node 1, while node 0 is collapsed. + /* The test builds the following tree and expands node 1, while node 0 is collapsed. * * 0 * |- 1 @@ -1385,7 +1385,7 @@ static void test_expandnotify(void) ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); - /* all next collapse/expand attempts won't produce any notifications, + /* all further collapse/expand attempts won't produce any notifications, the only way is to reset with all children removed */ ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "collapse after expand notifications", FALSE); @@ -1480,7 +1480,7 @@ static void test_TVS_SINGLEEXPAND(void) ok(ret, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_singleexpand_seq, "singleexpand notifications", FALSE); - /* a workaround for NT4 that sends expanding notification when nothing is about to expand */ + /* a workaround for NT4 that sends expand notifications when nothing is about to expand */ ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hRoot); ok(ret, "got %d\n", ret); fill_tree(hTree); diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 98d996f..07bc2ca 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -135,7 +135,7 @@ static void test_mutex(void) ok(hCreated != NULL, "CreateMutex failed with error %d\n", GetLastError()); hOpened = OpenMutex(0, FALSE, "WineTestMutex"); - ok(hOpened == NULL, "OpenMutex succeded\n"); + ok(hOpened == NULL, "OpenMutex succeeded\n"); hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); @@ -171,7 +171,7 @@ static void test_mutex(void) } } - ok( failed == 0x0de0fffe, "open succeded when it shouldn't: %x\n", failed); + ok( failed == 0x0de0fffe, "open succeeded when it shouldn't: %x\n", failed); ret = ReleaseMutex(hCreated); ok(!ret && (GetLastError() == ERROR_NOT_OWNER), diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 3a0a9e2..59e277e 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -173,10 +173,10 @@ static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; static const char afile[] = "test.avi"; /* This test doesn't use the quartz filtergraph because it makes it impossible - * to be certain that a thread is really one owned by the avi splitter - * A lot of the decoder filters will also have their own thread, and windows' + * to be certain that a thread is really one owned by the avi splitter. + * A lot of the decoder filters will also have their own thread, and Windows' * filtergraph has a separate thread for start/stop/seeking requests. - * By avoiding the filtergraph all together and connecting streams directly to + * By avoiding the filtergraph altogether and connecting streams directly to * the null renderer I am sure that this is not the case here. */ static void test_threads(void) @@ -200,7 +200,7 @@ static void test_threads(void) return; } - /* Before doing anything (number of threads at the start differs per OS) */ + /* Before doing anything (the thread count at the start differs per OS) */ baselevel = count_threads(); file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, @@ -280,7 +280,7 @@ static void test_threads(void) curlevel = count_threads(); ok(curlevel == baselevel, - "Amount of threads should be %d not %d\n", baselevel, curlevel); + "The thread count should be %d not %d\n", baselevel, curlevel); hr = IPin_Connect(filepin, avipin, NULL); ok(hr == S_OK, "Could not connect: %08x\n", hr); @@ -290,7 +290,7 @@ static void test_threads(void) expected = 1 + baselevel; curlevel = count_threads(); ok(curlevel == expected, - "Amount of threads should be %d not %d\n", expected, curlevel); + "The thread count should be %d not %d\n", expected, curlevel); IUnknown_Release(avipin); avipin = NULL; @@ -346,7 +346,7 @@ static void test_threads(void) if (hr != S_OK) goto fail2; /* At this point there is a minimalistic connected avi splitter that can - * Be used for all sorts of source filter tests, however that still needs + * be used for all sorts of source filter tests. However that still needs * to be written at a later time. * * Interesting tests: @@ -366,7 +366,7 @@ static void test_threads(void) curlevel = count_threads(); ok(curlevel == expected, - "Amount of threads should be %d not %d\n", expected, curlevel); + "The thread count should be %d not %d\n", expected, curlevel); IBaseFilter_Pause(pavi); IBaseFilter_Pause(preader); @@ -442,7 +442,7 @@ fail: curlevel = count_threads(); todo_wine ok(curlevel == baselevel, - "Amount of threads should be %d not %d\n", baselevel, curlevel); + "The thread count should be %d not %d\n", baselevel, curlevel); } START_TEST(avisplitter) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index d0f0f0e..3519b34 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2364,7 +2364,7 @@ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) * counts that lie exactly on a 1024 byte boundary. */ if (i > 8) - dBytes = (double)(llBytes >> 20) + 0.001; /* Scale down by I MB */ + dBytes = (double)(llBytes >> 20) + 0.001; /* Scale down by 1 MB */ else dBytes = (double)llBytes + 0.00001; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8316112..593307e 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2855,7 +2855,7 @@ static void test_SHGetShellKey(void) hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); ok(hkey != NULL, "Can't open key\n"); - ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); + ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delete key\n"); RegCloseKey(hkey); hkey = pSHGetShellKey(SHKEY_Root_HKLM, WineTestW, TRUE); @@ -2911,7 +2911,7 @@ static void test_SHGetShellKey(void) hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); ok(hkey != NULL, "Can't create key\n"); - ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); + ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delete key\n"); RegCloseKey(hkey); } diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2dce850..b983a8d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -369,7 +369,7 @@ static WCHAR* utf8_chars_to_wchars(LPCSTR string) * FIXME: should not use stdio */ -static HRESULT convert_to_native_icon(IStream *icoFile, int *indeces, int numIndeces, +static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numIndices, const CLSID *outputFormat, const char *outputFileName, LPCWSTR commentW) { WCHAR *dosOutputFileName = NULL; @@ -420,7 +420,7 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indeces, int numInd goto end; } - for (i = 0; i < numIndeces; i++) + for (i = 0; i < numIndices; i++) { IWICBitmapFrameDecode *sourceFrame = NULL; IWICBitmapSource *sourceBitmap = NULL; @@ -428,10 +428,10 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indeces, int numInd IPropertyBag2 *options = NULL; UINT width, height; - hr = IWICBitmapDecoder_GetFrame(decoder, indeces[i], &sourceFrame); + hr = IWICBitmapDecoder_GetFrame(decoder, indices[i], &sourceFrame); if (FAILED(hr)) { - WINE_ERR("error 0x%08X getting frame %d\n", hr, indeces[i]); + WINE_ERR("error 0x%08X getting frame %d\n", hr, indices[i]); goto endloop; } hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)sourceFrame, &sourceBitmap);

1 0

Francois Gouget : tests: Remove unneeded assert.h includes.
by Alexandre Julliard 27 Sep '11

27 Sep '11

1 0

Francois Gouget : gdi32: The GetKerningPairsA() test should pass on all the platforms we care about now.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 262a77057dca2a80fbbcddb82c6a0269bcd09502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262a77057dca2a80fbbcddb82… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 27 00:18:00 2011 +0200 gdi32: The GetKerningPairsA() test should pass on all the platforms we care about now. --- dlls/gdi32/tests/font.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 570ae14..097a6c3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1342,13 +1342,14 @@ todo_wine { trace("total_kern_pairs %u\n", total_kern_pairs); kern_pair = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pair)); -#if 0 /* Win98 (GetKerningPairsA) and XP behave differently here, the test passes on XP */ + /* Win98 (GetKerningPairsA) and XP behave differently here, the test + * passes on XP. + */ SetLastError(0xdeadbeef); ret = GetKerningPairsW(hdc, 0, kern_pair); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "got error %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - ok(ret == 0, "got %lu, expected 0\n", ret); -#endif + "got error %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(ret == 0, "got %u, expected 0\n", ret); ret = GetKerningPairsW(hdc, 100, NULL); ok(ret == total_kern_pairs, "got %u, expected %u\n", ret, total_kern_pairs);

1 0

Francois Gouget : shell32: Add definitions for the IEnumACString interface.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: cd88a0f32cac438baedfe885c388d4c85931d929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd88a0f32cac438baedfe885c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 27 00:17:45 2011 +0200 shell32: Add definitions for the IEnumACString interface. Enable the corresponding browseui:autocomplete tests. --- dlls/browseui/tests/autocomplete.c | 9 ++++----- include/shldisp.idl | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index e56c599..e566e6e 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -23,6 +23,7 @@ #include <initguid.h> #include <windows.h> #include <shlobj.h> +#include <shldisp.h> #include <shlwapi.h> #include <shlguid.h> @@ -127,10 +128,8 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI return S_OK; } -#if 0 /* IID_IEnumACString not defined yet in wine */ if (!IsEqualGUID(iid, &IID_IEnumACString)) trace("unknown interface queried\n"); -#endif return E_NOINTERFACE; } @@ -239,6 +238,7 @@ static void test_ACLMulti(void) const char *strings2[] = {"a", "b", "d"}; WCHAR exp[] = {'A','B','C',0}; IEnumString *obj; + IEnumACString *unk; TestACL *acl1, *acl2; IACList *acl; IObjMgr *mgr; @@ -252,11 +252,10 @@ static void test_ACLMulti(void) ok(obj->lpVtbl->QueryInterface(obj, &IID_IACList2, &tmp) == E_NOINTERFACE, "Unexpected interface IACList2 in ACLMulti\n"); stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr)); -#if 0 /* IID_IEnumACString not defined yet in wine */ - ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, &unk)); + + todo_wine ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk)); if (unk != NULL) unk->lpVtbl->Release(unk); -#endif ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); ok(i == 0, "Unexpected fetched value %d\n", i); diff --git a/include/shldisp.idl b/include/shldisp.idl index 8df56cd..5c04f71 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -28,6 +28,35 @@ import "comcat.idl"; #include <shdispid.h> /***************************************************************************** + * IEnumACString interface + */ +[ + local, + object, + uuid(8e74c210-cf9d-4eaf-a403-7356428f0a5a), + pointer_default(unique) +] +interface IEnumACString : IEnumString +{ + typedef IEnumACString *PENUMACSTRING, *LPENUMACSTRING; + + typedef enum _tagACENUMOPTION + { + ACEO_NONE = 0x00000000, + ACEO_MOSTRECENTFIRST = 0x00000001, + ACEO_FIRSTUNUSED = 0x00010000, + } ACENUMOPTION; + + HRESULT NextItem( [out] LPWSTR pszUrl, + [in] ULONG cchMax, + [out] ULONG *pulSortIndex); + + HRESULT SetEnumOptions( [in] DWORD dwOptions ); + + HRESULT GetEnumOptions( [out] DWORD *pdwOptions ); +} + +/***************************************************************************** * IAutoComplete interface */ [

1 0

Francois Gouget : d3drm/tests: Remove an unneeded assert.h include.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 9fbd18cc346f0dc7e7518a232964d547ccee33f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbd18cc346f0dc7e7518a232… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 27 00:14:22 2011 +0200 d3drm/tests: Remove an unneeded assert.h include. --- dlls/d3drm/tests/vector.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 1961fe0..f00ee65 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include "d3drmdef.h" #include <math.h> +#include "d3drmdef.h" + #include "wine/test.h" #define PI (4.0f*atanf(1.0f))

1 0

Francois Gouget : msi/tests: Avoid #if 0 to make sure code still compiles.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: d2084d5a41b544c9361d09a4b0a9e93630ae9be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2084d5a41b544c9361d09a4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 26 23:41:26 2011 +0200 msi/tests: Avoid #if 0 to make sure code still compiles. --- dlls/msi/tests/install.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b1db7e4..bb8335a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3768,10 +3768,8 @@ static void generate_transform(void) r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0); ok(r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r); -#if 0 /* not implemented in wine yet */ r = MsiCreateTransformSummaryInfo(hdb2, hdb2, mstfile, 0, 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); -#endif + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); MsiCloseHandle(hdb1); MsiCloseHandle(hdb2);

1 0

Francois Gouget : gdi32/tests: Use if(0) instead of #if 0 to make sure code still compiles.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: a87797fbe2104c2d98274bf2c6547f37938abc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87797fbe2104c2d98274bf2c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 26 23:41:14 2011 +0200 gdi32/tests: Use if(0) instead of #if 0 to make sure code still compiles. --- dlls/gdi32/tests/font.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6ce8282..570ae14 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1364,11 +1364,10 @@ todo_wine { for (n = 0; n < ret; n++) { DWORD j; -#if 0 - if (kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127) + /* Disabled to limit console spam */ + if (0 && kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127) trace("{'%c','%c',%d},\n", kern_pair[n].wFirst, kern_pair[n].wSecond, kern_pair[n].iKernAmount); -#endif for (j = 0; j < kd[i].total_kern_pairs; j++) { if (kern_pair[n].wFirst == kd[i].kern_pair[j].wFirst && @@ -1820,6 +1819,7 @@ static void test_GetFontUnicodeRanges(void) HFONT hfont, hfont_old; DWORD size; GLYPHSET *gs; + DWORD i; if (!pGetFontUnicodeRanges) { @@ -1844,10 +1844,10 @@ static void test_GetFontUnicodeRanges(void) size = pGetFontUnicodeRanges(hdc, gs); ok(size, "GetFontUnicodeRanges failed\n"); -#if 0 - for (i = 0; i < gs->cRanges; i++) - trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); -#endif + + if (0) /* Disabled to limit console spam */ + for (i = 0; i < gs->cRanges; i++) + trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); trace("found %u ranges\n", gs->cRanges); HeapFree(GetProcessHeap(), 0, gs); @@ -1878,10 +1878,9 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); if (type != TRUETYPE_FONTTYPE) return 1; -#if 0 - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); -#endif + if (0) /* Disabled to limit console spam */ + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; else @@ -1897,10 +1896,9 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); if (type != TRUETYPE_FONTTYPE) return 1; -#if 0 - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); -#endif + if (0) /* Disabled to limit console spam */ + trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", + wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; else

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.0.2.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: bugzilla Branch: upstream Commit: 48ead63356288ccfcbbfbfa8e71b7042d3fe1104 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=48ead63356288ccfcbbfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 20:58:07 2011 +0200 Import of upstream bugzilla release 4.0.2. --- .bzrignore | 5 +- .bzrrev | 1 - .cvsignore | 6 - .htaccess | 25 + Bugzilla.pm | 69 +- Bugzilla/.cvsignore | 1 - Bugzilla/Attachment.pm | 41 +- Bugzilla/Auth.pm | 7 +- Bugzilla/Auth/Login.pm | 9 + Bugzilla/Auth/Login/Cookie.pm | 1 + Bugzilla/Auth/Login/Env.pm | 1 + Bugzilla/Auth/Login/Stack.pm | 5 + Bugzilla/Bug.pm | 1276 ++-- Bugzilla/BugMail.pm | 289 +- Bugzilla/CGI.pm | 98 +- Bugzilla/Chart.pm | 2 +- Bugzilla/Classification.pm | 15 +- Bugzilla/Comment.pm | 42 +- Bugzilla/Component.pm | 68 +- Bugzilla/Config/Advanced.pm | 10 + Bugzilla/Config/BugFields.pm | 6 - Bugzilla/Config/Common.pm | 10 +- Bugzilla/Config/MTA.pm | 6 - Bugzilla/Config/Query.pm | 4 +- Bugzilla/Constants.pm | 88 +- Bugzilla/DB.pm | 216 +- Bugzilla/DB/Mysql.pm | 40 +- Bugzilla/DB/Oracle.pm | 14 +- Bugzilla/DB/Pg.pm | 45 +- Bugzilla/DB/Schema.pm | 121 +- Bugzilla/DB/Schema/Mysql.pm | 3 + Bugzilla/DB/Schema/Oracle.pm | 70 +- Bugzilla/Error.pm | 15 + Bugzilla/Extension.pm | 14 +- Bugzilla/Field.pm | 263 +- Bugzilla/Field/Choice.pm | 171 +- Bugzilla/Field/ChoiceInterface.pm | 273 + Bugzilla/Flag.pm | 52 +- Bugzilla/FlagType.pm | 53 +- Bugzilla/Group.pm | 58 +- Bugzilla/Hook.pm | 403 +- Bugzilla/Install.pm | 107 +- Bugzilla/Install/CPAN.pm | 20 +- Bugzilla/Install/DB.pm | 194 +- Bugzilla/Install/Filesystem.pm | 423 +- Bugzilla/Install/Requirements.pm | 300 +- Bugzilla/Install/Util.pm | 224 +- Bugzilla/JobQueue/Runner.pm | 9 +- Bugzilla/Keyword.pm | 13 +- Bugzilla/Mailer.pm | 10 +- Bugzilla/Migrate.pm | 16 +- Bugzilla/Migrate/Gnats.pm | 19 +- Bugzilla/Milestone.pm | 32 +- Bugzilla/Object.pm | 271 +- Bugzilla/Product.pm | 405 +- Bugzilla/Search.pm | 946 ++- Bugzilla/Search/Quicksearch.pm | 30 +- Bugzilla/Search/Recent.pm | 166 + Bugzilla/Search/Saved.pm | 36 +- Bugzilla/Series.pm | 5 + Bugzilla/Status.pm | 7 +- Bugzilla/Template.pm | 216 +- Bugzilla/Template/Plugin/Hook.pm | 14 +- Bugzilla/Token.pm | 3 - Bugzilla/User.pm | 242 +- Bugzilla/User/Setting/Timezone.pm | 1 + Bugzilla/Util.pm | 93 +- Bugzilla/Version.pm | 26 +- Bugzilla/WebService.pm | 26 +- Bugzilla/WebService/Bug.pm | 1325 +++- Bugzilla/WebService/Bugzilla.pm | 20 +- Bugzilla/WebService/Constants.pm | 41 +- Bugzilla/WebService/Product.pm | 22 +- Bugzilla/WebService/Server.pm | 5 + Bugzilla/WebService/Server/JSONRPC.pm | 274 +- Bugzilla/WebService/Server/XMLRPC.pm | 6 +- Bugzilla/WebService/User.pm | 104 +- Bugzilla/WebService/Util.pm | 42 +- Bugzilla/Whine.pm | 132 + Bugzilla/Whine/Schedule.pm | 2 - attachment.cgi | 24 +- buglist.cgi | 121 +- bugzilla.dtd | 59 +- chart.cgi | 2 +- checksetup.pl | 7 +- colchange.cgi | 105 +- collectstats.pl | 18 +- config.cgi | 5 +- contrib/.cvsignore | 1 - contrib/{bugzilla-queue => bugzilla-queue.rhel} | 0 contrib/bugzilla-queue.suse | 174 + contrib/bugzilla-submit/bugzilla-submit | 2 +- contrib/bzdbcopy.pl | 8 +- contrib/console.pl | 2 +- contrib/convert-workflow.pl | 135 + contrib/jb2bz.py | 8 +- contrib/merge-users.pl | 38 +- contrib/new-yui.sh | 17 + contrib/sendbugmail.pl | 7 +- docs/bugzilla.ent | 11 +- docs/en/.cvsignore | 3 - docs/en/images/bzLifecycle.png | Bin 74447 -> 36761 bytes docs/en/images/bzLifecycle.xml | 1569 ++-- docs/en/rel_notes.txt | 12 +- docs/en/xml/.cvsignore | 1 - docs/en/xml/Bugzilla-Guide.xml | 6 +- docs/en/xml/administration.xml | 24 +- docs/en/xml/bugzilla.ent | 11 +- docs/en/xml/glossary.xml | 2 - docs/en/xml/installation.xml | 25 +- editclassifications.cgi | 2 +- editcomponents.cgi | 4 +- editfields.cgi | 8 +- editflagtypes.cgi | 13 +- editgroups.cgi | 7 +- editkeywords.cgi | 2 +- editmilestones.cgi | 9 +- editproducts.cgi | 27 +- editusers.cgi | 9 +- editvalues.cgi | 19 +- editversions.cgi | 6 +- editwhines.cgi | 37 +- editworkflow.cgi | 2 +- email_in.pl | 60 +- enter_bug.cgi | 123 +- extensions/Example/Extension.pm | 263 +- .../en/default/account/prefs/my_tab.html.tmpl | 30 + .../hook/account/prefs/prefs-tabs.html.tmpl | 23 + .../admin/sanitycheck/messages-statuses.html.tmpl | 3 +- .../hook/global/setting-descs-settings.none.tmpl | 6 + .../hook/global/user-error-errors.html.tmpl | 3 + .../template/en/default/pages/example.html.tmpl | 2 +- extensions/OldBugMove/Config.pm | 25 + extensions/OldBugMove/Extension.pm | 208 + .../OldBugMove/lib/Params.pm | 39 +- .../en/default/admin/params/oldbugmove.html.tmpl | 29 +- .../hook/bug/edit-after_comment_textarea.html.tmpl | 27 + .../default/hook/bug/format_comment-type.txt.tmpl | 29 + .../user-error-auth_failure_action.html.tmpl | 23 + .../hook/global/user-error-errors.html.tmpl | 29 + .../hook/list/edit-multiple-after_groups.html.tmpl | 28 + extensions/Voting/Extension.pm | 870 +++ .../account/prefs/email-relationships.html.tmpl | 22 + .../hook/admin/products/edit-common-rows.html.tmpl | 60 + .../hook/admin/products/updated-changes.html.tmpl | 102 + .../admin/sanitycheck/messages-statuses.html.tmpl | 41 + .../admin/users/confirm-delete-warn_safe.html.tmpl | 38 + .../hook/bug/edit-after_importance.html.tmpl | 41 + .../default/hook/bug/format_comment-type.txt.tmpl | 23 + .../hook/bug/process/header-title.html.tmpl | 24 + .../hook/bug/process/results-title.html.tmpl | 21 + .../hook/global/code-error-errors.html.tmpl | 25 + .../default/hook/global/field-descs-end.none.tmpl | 23 + .../default/hook/global/reason-descs-end.none.tmpl | 23 + .../hook/global/user-error-errors.html.tmpl | 55 + .../search/form-after_freetext_fields.html.tmpl | 28 + .../search-report-select-rep_fields.html.tmpl | 21 + .../template}/en/default/pages/voting.html.tmpl | 2 +- .../template/en/default/pages/voting/bug.html.tmpl | 15 +- .../en/default/pages/voting/user.html.tmpl | 36 +- .../en/default/voting}/delete-all.html.tmpl | 4 +- .../en/default/voting}/votes-removed.txt.tmpl | 0 .../voting.css => extensions/Voting/web/style.css | 0 extensions/create.pl | 3 +- importxml.pl | 148 +- install-module.pl | 9 +- js/TUI.js | 11 +- js/attachment.js | 37 +- js/bug.js | 131 + js/comments.js | 99 + js/field.js | 206 +- js/flag.js | 16 +- js/global.js | 10 + js/help.js | 108 - js/util.js | 13 +- js/yui/animation/animation-min.js | 23 + js/yui/assets/skins/sam/ajax-loader.gif | Bin 0 -> 3208 bytes js/yui/assets/skins/sam/asc.gif | Bin 0 -> 177 bytes js/yui/assets/skins/sam/autocomplete.css | 7 + js/yui/assets/skins/sam/back-h.png | Bin 0 -> 334 bytes js/yui/assets/skins/sam/back-v.png | Bin 0 -> 338 bytes js/yui/assets/skins/sam/bar-h.png | Bin 0 -> 365 bytes js/yui/assets/skins/sam/bar-v.png | Bin 0 -> 387 bytes js/yui/assets/skins/sam/bg-h.gif | Bin 0 -> 212 bytes js/yui/assets/skins/sam/bg-v.gif | Bin 0 -> 481 bytes js/yui/assets/skins/sam/blankimage.png | Bin 0 -> 2314 bytes js/yui/assets/skins/sam/button.css | 7 + js/yui/assets/skins/sam/calendar.css | 8 + js/yui/assets/skins/sam/carousel.css | 7 + js/yui/assets/skins/sam/check0.gif | Bin 0 -> 608 bytes js/yui/assets/skins/sam/check1.gif | Bin 0 -> 622 bytes js/yui/assets/skins/sam/check2.gif | Bin 0 -> 609 bytes js/yui/assets/skins/sam/colorpicker.css | 7 + js/yui/assets/skins/sam/container.css | 7 + js/yui/assets/skins/sam/datatable.css | 8 + js/yui/assets/skins/sam/desc.gif | Bin 0 -> 177 bytes js/yui/assets/skins/sam/dt-arrow-dn.png | Bin 0 -> 116 bytes js/yui/assets/skins/sam/dt-arrow-up.png | Bin 0 -> 116 bytes js/yui/assets/skins/sam/editor-knob.gif | Bin 0 -> 138 bytes js/yui/assets/skins/sam/editor-sprite-active.gif | Bin 0 -> 5614 bytes js/yui/assets/skins/sam/editor-sprite.gif | Bin 0 -> 5690 bytes js/yui/assets/skins/sam/editor.css | 10 + js/yui/assets/skins/sam/header_background.png | Bin 0 -> 158 bytes js/yui/assets/skins/sam/hue_bg.png | Bin 0 -> 1120 bytes js/yui/assets/skins/sam/imagecropper.css | 7 + js/yui/assets/skins/sam/layout.css | 7 + js/yui/assets/skins/sam/layout_sprite.png | Bin 0 -> 1409 bytes js/yui/assets/skins/sam/loading.gif | Bin 0 -> 2673 bytes js/yui/assets/skins/sam/logger.css | 7 + .../skins/sam/menu-button-arrow-disabled.png | Bin 0 -> 173 bytes js/yui/assets/skins/sam/menu-button-arrow.png | Bin 0 -> 173 bytes js/yui/assets/skins/sam/menu.css | 7 + .../skins/sam/menubaritem_submenuindicator.png | Bin 0 -> 3618 bytes .../sam/menubaritem_submenuindicator_disabled.png | Bin 0 -> 3618 bytes js/yui/assets/skins/sam/menuitem_checkbox.png | Bin 0 -> 3625 bytes .../skins/sam/menuitem_checkbox_disabled.png | Bin 0 -> 3625 bytes .../assets/skins/sam/menuitem_submenuindicator.png | Bin 0 -> 3617 bytes .../sam/menuitem_submenuindicator_disabled.png | Bin 0 -> 3617 bytes js/yui/assets/skins/sam/paginator.css | 7 + js/yui/assets/skins/sam/picker_mask.png | Bin 0 -> 12174 bytes js/yui/assets/skins/sam/profilerviewer.css | 7 + js/yui/assets/skins/sam/progressbar.css | 7 + js/yui/assets/skins/sam/resize.css | 7 + js/yui/assets/skins/sam/simpleeditor.css | 10 + js/yui/assets/skins/sam/slider.css | 7 + .../assets/skins/sam/split-button-arrow-active.png | Bin 0 -> 280 bytes .../skins/sam/split-button-arrow-disabled.png | Bin 0 -> 185 bytes .../assets/skins/sam/split-button-arrow-focus.png | Bin 0 -> 185 bytes .../assets/skins/sam/split-button-arrow-hover.png | Bin 0 -> 185 bytes js/yui/assets/skins/sam/split-button-arrow.png | Bin 0 -> 185 bytes .../yui => js/yui/assets/skins/sam}/sprite.png | Bin 3745 -> 3745 bytes js/yui/assets/skins/sam/tabview.css | 8 + js/yui/assets/skins/sam/treeview-loading.gif | Bin 0 -> 2673 bytes js/yui/assets/skins/sam/treeview-sprite.gif | Bin 0 -> 4326 bytes js/yui/assets/skins/sam/treeview.css | 7 + js/yui/assets/skins/sam/wait.gif | Bin 0 -> 1100 bytes js/yui/assets/skins/sam/yuitest.css | 7 + js/yui/autocomplete/autocomplete-min.js | 12 + js/yui/base/base-min.css | 7 + js/yui/base/base.css | 131 + js/yui/button/button-min.js | 11 + js/yui/calendar.js | 18 - js/yui/calendar/calendar-min.js | 18 + js/yui/carousel/carousel-min.js | 12 + js/yui/charts/charts-min.js | 9 + js/yui/colorpicker/colorpicker-min.js | 9 + js/yui/connection/connection-min.js | 9 + js/yui/connection/connection.swf | Bin 0 -> 2423 bytes js/yui/connection/connection_core-min.js | 8 + js/yui/container/container-min.js | 19 + js/yui/container/container_core-min.js | 14 + js/yui/cookie.js | 7 - js/yui/cookie/cookie-min.js | 7 + js/yui/datasource/datasource-min.js | 12 + js/yui/datatable/datatable-min.js | 29 + js/yui/datemath/datemath-min.js | 7 + js/yui/dom/dom-min.js | 9 + js/yui/dragdrop/dragdrop-min.js | 10 + js/yui/element-delegate/element-delegate-min.js | 7 + js/yui/element/element-min.js | 8 + js/yui/event-delegate/event-delegate-min.js | 7 + js/yui/event-mouseenter/event-mouseenter-min.js | 7 + js/yui/event-simulate/event-simulate-min.js | 7 + js/yui/event/event-min.js | 11 + js/yui/fonts/fonts-min.css | 7 + js/yui/fonts/fonts.css | 56 + js/yui/get/get-min.js | 7 + js/yui/grids/grids-min.css | 7 + js/yui/grids/grids.css | 467 ++ js/yui/history/history-min.js | 7 + js/yui/imagecropper/imagecropper-min.js | 8 + js/yui/imageloader/imageloader-min.js | 7 + js/yui/json/json-min.js | 7 + js/yui/layout/layout-min.js | 11 + js/yui/logger/logger-min.js | 9 + js/yui/menu/menu-min.js | 16 + js/yui/paginator/paginator-min.js | 10 + js/yui/profiler/profiler-min.js | 7 + js/yui/profilerviewer/profilerviewer-min.js | 9 + js/yui/progressbar/progressbar-min.js | 8 + js/yui/reset-fonts-grids/reset-fonts-grids.css | 7 + js/yui/reset-fonts/reset-fonts.css | 7 + js/yui/reset/reset-min.css | 7 + js/yui/reset/reset.css | 142 + js/yui/resize/resize-min.js | 10 + js/yui/selector/selector-min.js | 8 + js/yui/slider/slider-min.js | 9 + js/yui/storage/storage-min.js | 8 + js/yui/stylesheet/stylesheet-min.js | 7 + js/yui/swf/swf-min.js | 7 + js/yui/swfdetect/swfdetect-min.js | 7 + js/yui/swfstore/swfstore-min.js | 7 + js/yui/swfstore/swfstore.swf | Bin 0 -> 4879 bytes js/yui/tabview/tabview-min.js | 8 + js/yui/treeview/treeview-min.js | 12 + js/yui/uploader/uploader-min.js | 15 + js/yui/yahoo-dom-event.js | 12 - js/yui/yahoo-dom-event/yahoo-dom-event.js | 14 + js/yui/yahoo/yahoo-min.js | 7 + js/yui/yuiloader/yuiloader-min.js | 10 + js/yui/yuitest/yuitest-min.js | 10 + js/yui/yuitest/yuitest_core-min.js | 9 + lib/CGI.pm | 8146 ++++++++++++++++++++ lib/CGI/Apache.pm | 27 + lib/CGI/Carp.pm | 630 ++ lib/CGI/Cookie.pm | 540 ++ lib/CGI/Fast.pm | 224 + lib/CGI/Pretty.pm | 312 + lib/CGI/Push.pm | 325 + lib/CGI/Switch.pm | 28 + lib/CGI/Util.pm | 331 + long_list.cgi | 2 +- mod_perl.pl | 27 +- page.cgi | 2 +- post_bug.cgi | 23 +- process_bug.cgi | 480 +- query.cgi | 40 +- relogin.cgi | 4 +- report.cgi | 32 +- request.cgi | 13 +- sanitycheck.cgi | 197 +- showdependencygraph.cgi | 29 +- skins/.cvsignore | 1 - skins/README | 20 + skins/contrib/Dusk/.cvsignore | 17 - skins/contrib/Dusk/global.css | 8 +- skins/contrib/Dusk/index.css | 16 - skins/contrib/Dusk/index/account.gif | Bin 6869 -> 0 bytes skins/contrib/Dusk/index/bug.gif | Bin 6370 -> 0 bytes skins/contrib/Dusk/index/search.gif | Bin 6661 -> 0 bytes skins/standard/IE-fixes.css | 21 + skins/standard/admin.css | 12 + skins/standard/attachment.css | 246 + skins/standard/buglist.css | 9 +- skins/standard/create_attachment.css | 145 - skins/standard/enter_bug.css | 72 + skins/standard/global.css | 78 +- skins/standard/help.css | 41 - skins/standard/index.css | 23 +- skins/standard/index/account.gif | Bin 7130 -> 0 bytes skins/standard/index/bug.gif | Bin 6586 -> 0 bytes skins/standard/index/file-a-bug.png | Bin 0 -> 3534 bytes skins/standard/index/help.png | Bin 0 -> 4111 bytes skins/standard/index/new-account.png | Bin 0 -> 4082 bytes skins/standard/index/search.gif | Bin 6907 -> 0 bytes skins/standard/index/search.png | Bin 0 -> 4828 bytes skins/standard/page.css | 33 + skins/standard/search_form.css | 202 + skins/standard/show_bug.css | 15 +- skins/standard/yui/calendar.css | 7 - summarize_time.cgi | 12 +- t/.cvsignore | 1 - t/007util.t | 8 +- t/008filter.t | 28 +- t/010dependencies.t | 38 +- template/.cvsignore | 3 - template/en/.cvsignore | 2 - template/en/default/account/auth/login.html.tmpl | 3 +- .../en/default/account/email/confirm-new.html.tmpl | 2 +- template/en/default/account/prefs/email.html.tmpl | 84 +- template/en/default/account/prefs/prefs.html.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 16 +- .../en/default/admin/classifications/add.html.tmpl | 23 +- .../admin/classifications/edit-common.html.tmpl | 47 + .../default/admin/classifications/edit.html.tmpl | 24 +- .../en/default/admin/components/create.html.tmpl | 64 +- .../default/admin/components/edit-common.html.tmpl | 86 + .../en/default/admin/components/edit.html.tmpl | 66 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 20 +- .../default/admin/custom_fields/create.html.tmpl | 42 +- .../en/default/admin/custom_fields/edit.html.tmpl | 47 +- .../en/default/admin/custom_fields/list.html.tmpl | 4 + .../en/default/admin/fieldvalues/create.html.tmpl | 3 + .../en/default/admin/fieldvalues/edit.html.tmpl | 11 +- .../en/default/admin/params/advanced.html.tmpl | 31 + .../en/default/admin/params/attachment.html.tmpl | 2 +- template/en/default/admin/params/auth.html.tmpl | 4 +- .../en/default/admin/params/bugchange.html.tmpl | 10 +- .../en/default/admin/params/bugfields.html.tmpl | 5 - template/en/default/admin/params/bugmove.html.tmpl | 49 - template/en/default/admin/params/common.html.tmpl | 79 +- .../default/admin/params/dependencygraph.html.tmpl | 4 +- .../en/default/admin/params/editparams.html.tmpl | 2 +- template/en/default/admin/params/general.html.tmpl | 2 +- template/en/default/admin/params/index.html.tmpl | 2 +- template/en/default/admin/params/mta.html.tmpl | 12 +- template/en/default/admin/params/radius.html.tmpl | 8 +- .../en/default/admin/products/create.html.tmpl | 9 +- .../default/admin/products/edit-common.html.tmpl | 33 +- .../admin/products/list-classifications.html.tmpl | 13 +- template/en/default/admin/products/list.html.tmpl | 34 +- .../en/default/admin/products/updated.html.tmpl | 84 +- .../default/admin/sanitycheck/messages.html.tmpl | 60 +- .../default/admin/users/confirm-delete.html.tmpl | 23 +- .../default/admin/users/responsibilities.html.tmpl | 4 + template/en/default/attachment/create.html.tmpl | 8 +- .../attachment/createformcontents.html.tmpl | 18 +- template/en/default/attachment/diff-file.html.tmpl | 4 +- .../en/default/attachment/diff-header.html.tmpl | 8 +- template/en/default/attachment/edit.html.tmpl | 343 +- template/en/default/attachment/list.html.tmpl | 32 +- .../en/default/attachment/show-multiple.html.tmpl | 2 +- template/en/default/bug/activity/table.html.tmpl | 8 +- template/en/default/bug/comments.html.tmpl | 93 +- .../en/default/bug/create/create-guided.html.tmpl | 11 +- template/en/default/bug/create/create.html.tmpl | 358 +- template/en/default/bug/dependency-tree.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 181 +- template/en/default/bug/field-events.js.tmpl | 4 + template/en/default/bug/field-help.none.tmpl | 241 + template/en/default/bug/field-label.html.tmpl | 52 + template/en/default/bug/field.html.tmpl | 111 +- template/en/default/bug/format_comment.txt.tmpl | 12 +- template/en/default/bug/navigate.html.tmpl | 64 +- template/en/default/bug/process/header.html.tmpl | 4 +- template/en/default/bug/process/midair.html.tmpl | 3 +- template/en/default/bug/process/results.html.tmpl | 3 +- .../bug/process/verify-new-product.html.tmpl | 32 +- template/en/default/bug/show-header.html.tmpl | 9 +- template/en/default/bug/show-multiple.html.tmpl | 7 + template/en/default/bug/show.xml.tmpl | 8 +- template/en/default/bug/summarize-time.html.tmpl | 22 +- template/en/default/email/newchangedmail.txt.tmpl | 64 +- template/en/default/email/whine.txt.tmpl | 13 +- template/en/default/extensions/web-readme.txt.tmpl | 29 + template/en/default/filterexceptions.pl | 26 +- template/en/default/flag/list.html.tmpl | 77 +- template/en/default/global/code-error.html.tmpl | 53 +- template/en/default/global/common-links.html.tmpl | 3 +- .../en/default/global/confirm-action.html.tmpl | 1 + .../en/default/global/confirm-user-match.html.tmpl | 7 +- template/en/default/global/field-descs.none.tmpl | 13 +- template/en/default/global/header.html.tmpl | 237 +- template/en/default/global/help.html.tmpl | 5 +- template/en/default/global/hidden-fields.html.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 19 +- .../en/default/global/per-bug-queries.html.tmpl | 1 + template/en/default/global/reason-descs.none.tmpl | 40 + template/en/default/global/setting-descs.none.tmpl | 3 + .../en/default/global/site-navigation.html.tmpl | 13 +- template/en/default/global/textarea.html.tmpl | 6 + template/en/default/global/user-error.html.tmpl | 210 +- template/en/default/global/userselect.html.tmpl | 50 +- template/en/default/global/value-descs.js.tmpl | 33 + template/en/default/global/variables.none.tmpl | 2 + template/en/default/index.html.tmpl | 6 +- template/en/default/list/change-columns.html.tmpl | 38 +- template/en/default/list/edit-multiple.html.tmpl | 79 +- template/en/default/list/list-simple.html.tmpl | 3 +- template/en/default/list/list.html.tmpl | 6 +- template/en/default/list/list.ics.tmpl | 2 +- template/en/default/list/list.rdf.tmpl | 2 +- template/en/default/list/table.html.tmpl | 13 +- template/en/default/pages/fields.html.tmpl | 327 +- template/en/default/pages/quicksearch.html.tmpl | 10 +- template/en/default/pages/release-notes.html.tmpl | 1155 +++- template/en/default/reports/components.html.tmpl | 5 +- .../en/default/reports/duplicates-simple.html.tmpl | 4 +- template/en/default/reports/duplicates.html.tmpl | 8 +- template/en/default/reports/keywords.html.tmpl | 5 +- template/en/default/request/email.txt.tmpl | 1 + template/en/default/request/queue.html.tmpl | 34 +- .../en/default/search/boolean-charts.html.tmpl | 27 +- template/en/default/search/field.html.tmpl | 142 + template/en/default/search/form.html.tmpl | 704 +-- .../en/default/search/search-advanced.html.tmpl | 29 +- .../default/search/search-create-series.html.tmpl | 4 +- template/en/default/search/search-help.html.tmpl | 107 - .../default/search/search-report-graph.html.tmpl | 17 +- .../default/search/search-report-select.html.tmpl | 8 +- .../default/search/search-report-table.html.tmpl | 23 +- template/en/default/setup/strings.txt.pl | 20 + template/en/default/sidebar.xul.tmpl | 3 - template/en/default/welcome-admin.html.tmpl | 12 +- template/en/default/whine/mail.html.tmpl | 59 +- template/en/default/whine/mail.txt.tmpl | 15 +- token.cgi | 7 +- userprefs.cgi | 105 +- votes.cgi | 355 +- whine.pl | 1 - whineatnews.pl | 12 +- xt/README | 18 + xt/lib/Bugzilla/Test/Search.pm | 942 +++ xt/lib/Bugzilla/Test/Search/AndTest.pm | 69 + xt/lib/Bugzilla/Test/Search/Constants.pm | 1040 +++ xt/lib/Bugzilla/Test/Search/FakeCGI.pm | 61 + xt/lib/Bugzilla/Test/Search/FieldTest.pm | 582 ++ xt/lib/Bugzilla/Test/Search/InjectionTest.pm | 77 + xt/lib/Bugzilla/Test/Search/OperatorTest.pm | 110 + xt/lib/Bugzilla/Test/Search/OrTest.pm | 186 + xt/search.t | 96 + 491 files changed, 31142 insertions(+), 8450 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=48ead63356288ccfc…

1 0

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

27 Sep '11

Module: bugzilla Branch: master Commit: 2488bad939b3d53ccfba6e2c3b2f5d6bf407515e URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=2488bad939b3d53ccfba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 16:03:04 2011 +0200 Merge branch 'upstream'. Conflicts: template/en/default/attachment/list.html.tmpl template/en/default/bug/edit.html.tmpl template/en/default/global/common-links.html.tmpl template/en/default/list/table.html.tmpl template/en/default/pages/fields.html.tmpl ---

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
100
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011