Addressing more review comments

Author: Skyaero42

Core/Libraries/Source/WWVegas/WWLib/WWCommon.h

@@ -26,8 +26,13 @@
 
 // This macro serves as a general way to determine the number of elements within an array.
 #ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) int(sizeof(x)/sizeof(x[0]))
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+#else
+template <typename Type, size_t Size> char (*ArraySizeHelper(Type(&)[Size]))[Size];
+#define ARRAY_SIZE(arr) sizeof(*ArraySizeHelper(arr))
 #endif
+#endif // ARRAY_SIZE
 
 enum
 {

Core/Libraries/Source/debug/debug_io_flat.cpp

@@ -275,7 +275,7 @@ void DebugIOFlat::ExpandMagic(const char *src, const char *splitName, char *buf)
     unsigned len=strlen(help);
     if (dst-buf+len>250)
       break;
-    strlcpy(dst, help, ARRAY_SIZE(dst));
+    strcpy(dst, help);
     dst+=len;
   }
   strcpy(dst,".log");

Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp

@@ -2098,16 +2098,13 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 	static FILE *theLogFile = NULL;
 	Bool open = false;
 	try {
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		if (char *pEnd = strrchr(dirbuf, '\\'))
+		char curbuf[_MAX_PATH];
+		GetModuleFileName(NULL, curbuf, sizeof(curbuf));
+		if (char *pEnd = strrchr(curbuf, '\\'))
 		{
 			*(pEnd + 1) = 0;
 		}
 
-		char curbuf[ _MAX_PATH ];
-
-		strlcpy(curbuf, dirbuf, ARRAY_SIZE(curbuf));
 		strlcat(curbuf, m_strTitle, ARRAY_SIZE(curbuf));
 		strlcat(curbuf, ".txt", ARRAY_SIZE(curbuf));
 

GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp

@@ -2155,16 +2155,13 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 	static FILE *theLogFile = NULL;
 	Bool open = false;
 	try {
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		if (char *pEnd = strrchr(dirbuf, '\\'))
+		char curbuf[_MAX_PATH];
+		GetModuleFileName(NULL, curbuf, sizeof(curbuf));
+		if (char *pEnd = strrchr(curbuf, '\\'))
 		{
 			*(pEnd + 1) = 0;
 		}
 
-		char curbuf[ _MAX_PATH ];
-
-		strlcpy(curbuf, dirbuf, ARRAY_SIZE(curbuf));
 		strlcat(curbuf, m_strTitle, ARRAY_SIZE(curbuf));
 		strlcat(curbuf, ".txt", ARRAY_SIZE(curbuf));