include: Make ARRAY_SIZE() available in wine/test.h.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/advapi32/tests/cred.c

@@ -27,8 +27,6 @@
 
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static BOOL (WINAPI *pCredDeleteA)(LPCSTR,DWORD,DWORD);
 static BOOL (WINAPI *pCredEnumerateA)(LPCSTR,DWORD,DWORD *,PCREDENTIALA **);
 static VOID (WINAPI *pCredFree)(PVOID);

dlls/advapi32/tests/eventlog.c

@@ -32,8 +32,6 @@
 
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*);
 static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
 

dlls/advapi32/tests/registry.c

@@ -32,7 +32,6 @@
 #include "winerror.h"
 #include "aclapi.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
 #define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2)
 
 static HKEY hkey_main;

dlls/advapi32/tests/security.c

@@ -36,8 +36,6 @@
 
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 #ifndef PROCESS_QUERY_LIMITED_INFORMATION
 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000
 #endif

dlls/comctl32/tests/button.c

@@ -28,7 +28,6 @@
 #include "msg.h"
 
 #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16))
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
 
 static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
 static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);

dlls/comdlg32/tests/filedlg.c

@@ -1026,8 +1026,6 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam,
     return FALSE;
 }
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 static void test_extension_helper(OPENFILENAMEA* ofn, const char *filter,
                                   const char *expected_filename)
 {

dlls/d2d1/tests/d2d1.c

@@ -26,10 +26,6 @@
 #include "dwrite.h"
 #include "wincodec.h"
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 struct resource_readback
 {
     ID3D10Resource *resource;

dlls/d3d10core/tests/device.c

@@ -26,10 +26,6 @@
 #include "wine/heap.h"
 #include "wine/test.h"
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 #define BITS_NNAN 0xffc00000
 #define BITS_NAN  0x7fc00000
 #define BITS_NINF 0xff800000

dlls/d3d11/tests/d3d11.c

@@ -28,10 +28,6 @@
 #include "wine/heap.h"
 #include "wine/test.h"
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 #define BITS_NNAN 0xffc00000
 #define BITS_NAN  0x7fc00000
 #define BITS_NINF 0xff800000

dlls/d3d8/tests/device.c

@@ -28,8 +28,6 @@
 #include <d3d8.h>
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 struct vec3
 {
     float x, y, z;

dlls/d3d9/tests/d3d9ex.c

@@ -26,8 +26,6 @@
 #include <initguid.h>
 #include <d3d9.h>
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static HMODULE d3d9_handle = 0;
 static DEVMODEW registry_mode;
 

dlls/d3d9/tests/device.c

@@ -27,8 +27,6 @@
 #include <d3d9.h>
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 struct vec3
 {
     float x, y, z;

dlls/d3d9/tests/stateblock.c

@@ -21,8 +21,6 @@
 #include <d3d9.h>
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static DWORD texture_stages;
 
 /* ============================ State Testing Framework ========================== */

dlls/d3d9/tests/visual.c

@@ -34,8 +34,6 @@
 #include <d3d9.h>
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 struct vec2
 {
     float x, y;

dlls/d3dx9_36/tests/effect.c

@@ -41,8 +41,6 @@ static float get_nan(void)
 #define NAN get_nan()
 #endif
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr))
-
 /* helper functions */
 static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps)
 {

dlls/d3dx9_36/tests/math.c

@@ -23,8 +23,6 @@
 #include "d3dx9.h"
 #include <math.h>
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static BOOL compare_float(float f, float g, unsigned int ulps)
 {
     int x = *(int *)&f;

dlls/d3dx9_36/tests/mesh.c

@@ -42,8 +42,6 @@ static inline float __port_nan(void)
 
 #define admitted_error 0.0001f
 
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
-
 #define compare_vertex_sizes(type, exp) \
     got=D3DXGetFVFVertexSize(type); \
     ok(got==exp, "Expected: %d, Got: %d\n", exp, got);

dlls/ddraw/tests/ddraw1.c

@@ -29,10 +29,6 @@ static DEVMODEW registry_mode;
 
 static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 struct vec2
 {
     float x, y;

dlls/ddraw/tests/ddraw2.c

@@ -31,10 +31,6 @@ static DEVMODEW registry_mode;
 
 static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 struct vec2
 {
     float x, y;

dlls/ddraw/tests/ddraw4.c

@@ -31,10 +31,6 @@ static DEVMODEW registry_mode;
 
 static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 struct vec2
 {
     float x, y;

dlls/ddraw/tests/ddraw7.c

@@ -32,10 +32,6 @@ static DEVMODEW registry_mode;
 
 static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 struct vec2
 {
     float x, y;

dlls/dmcompos/tests/dmcompos.c

@@ -26,8 +26,6 @@
 #include <dmusici.h>
 #include <dmusicf.h>
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 static BOOL missing_dmcompos(void)

dlls/dmime/tests/dmime.c

@@ -27,8 +27,6 @@
 #include <audioclient.h>
 #include <guiddef.h>
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 static BOOL missing_dmime(void)
 {
     IDirectMusicSegment8 *dms;

dlls/dmloader/tests/loader.c

@@ -24,8 +24,6 @@
 #include <dmusicf.h>
 #include "wine/test.h"
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */
 static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */

dlls/dmstyle/tests/dmstyle.c

@@ -26,8 +26,6 @@
 #include <dmusici.h>
 #include <dmusicf.h>
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 static BOOL missing_dmstyle(void)

dlls/dwrite/tests/analyzer.c

@@ -31,8 +31,6 @@
 
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static IDWriteFactory *factory;
 static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0};
 

dlls/dwrite/tests/font.c

@@ -33,8 +33,6 @@
 #include "wine/heap.h"
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p')
 #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X')
 #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p')

dlls/dwrite/tests/layout.c

@@ -29,8 +29,6 @@
 
 #include "wine/test.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0};
 static const WCHAR enusW[] = {'e','n','-','u','s',0};
 

dlls/dxgi/tests/device.c

@@ -23,10 +23,6 @@
 #include "d3d11.h"
 #include "wine/test.h"
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 enum frame_latency
 {
     DEFAULT_FRAME_LATENCY =  3,

dlls/shell32/tests/shellpath.c

@@ -43,10 +43,6 @@
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) )
-#endif
-
 /* from pidl.h, not included here: */
 #ifndef PT_CPL             /* Guess, Win7 uses this for CSIDL_CONTROLS */
 #define PT_CPL        0x01 /* no path */

dlls/shell32/tests/shlfolder.c

@@ -44,8 +44,6 @@
 DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36);
 DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37);
 
-#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) )
-
 static IMalloc *ppM;
 
 static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv);

dlls/user32/tests/cursoricon.c

@@ -1053,8 +1053,6 @@ static const DWORD biSize_tests[] = {
     0xffffffff
 };
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm)
 {
     BITMAP bm;

dlls/usp10/tests/usp10.c

@@ -31,10 +31,6 @@
 #include <windows.h>
 #include <usp10.h>
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
 typedef struct _itemTest {
     char todo_flag[6];
     int iCharPos;

dlls/xmllite/tests/reader.c

@@ -32,8 +32,6 @@
 #include "wine/test.h"
 #include "wine/heap.h"
 
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
-
 DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda);
 
 static WCHAR *a2w(const char *str)

include/wine/test.h

@@ -130,6 +130,8 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI
 #define todo_wine_if(is_todo)   todo_if((is_todo) && !strcmp(winetest_platform, "wine"))
 
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
 #ifdef NONAMELESSUNION
 # define U(x)  (x).u
 # define U1(x) (x).u1