[0.4.9][XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules. CORE-15127

I need this for the following commits to be able to fix more compiler warnings
without having to introduce additional diff for better code from newer branches, that
also uses this macro. The older the branch, the less of duplication we have for this
macro.

picked from 0.4.11-dev-258-g 82faa151e5

dll/directx/wine/d3dx9_36/d3dx9_36_private.h

@@ -49,8 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
 #define ULONG64_MAX (~(ULONG64)0)
 
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
-
 struct vec4
 {
     float x, y, z, w;

dll/directx/wine/ddraw/ddraw_private.h

@@ -44,8 +44,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN;
 extern DWORD force_refresh_rate DECLSPEC_HIDDEN;
 

dll/win32/comctl32/comctl32.h

@@ -45,8 +45,6 @@
 extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN;
 extern HBRUSH  COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN;
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 /* Property sheet / Wizard */
 #define IDD_PROPSHEET 1006
 #define IDD_WIZARD    1020

dll/win32/msi/tokenize.c

@@ -77,8 +77,6 @@ static const WCHAR updateW[] = {'U','P','D','A','T','E'};
 static const WCHAR valuesW[] = {'V','A','L','U','E','S'};
 static const WCHAR whereW[] = {'W','H','E','R','E'};
 
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
-
 /*
 ** These are the keywords
 ** They MUST be in alphabetical order

dll/win32/msxml3/msxml_private.h

@@ -31,8 +31,6 @@
 # error You must include config.h to use this header
 #endif
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 typedef enum {
     MSXML_DEFAULT = 0,
     MSXML2        = 20,

dll/win32/scrrun/scrrun_private.h

@@ -18,8 +18,6 @@
 #ifndef _SCRRUN_PRIVATE_H_
 #define _SCRRUN_PRIVATE_H_
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
 

dll/win32/wshom.ocx/wshom_private.h

@@ -27,8 +27,6 @@
 #include "ole2.h"
 #include "olectl.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
 /* typelibs */
 typedef enum tid_t {
     NULL_tid,

dll/win32/xmllite/xmllite_private.h

@@ -23,8 +23,6 @@
 
 #include "wine/heap.h"
 
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
-
 static inline void *m_alloc(IMalloc *imalloc, size_t len)
 {
     if (imalloc)

sdk/include/xdk/winnt_old.h

@@ -4308,6 +4308,10 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 {
 } TP_CALLBACK_ENVIRON_V1, TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON;
 #endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN7) */
 
+#ifdef __WINESRC__
+# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif