Patches for 64bit linux

[gaeorn]

If the va_list patch is what is causing the zone.exe crashes under windows, this patch should avoid the problem by using #ifndef WIN32 blocks. This patch should be applied against rev706 or later.

Index: common/MiscFunctions.cpp
===================================================================
--- common/MiscFunctions.cpp    (revision 707)
+++ common/MiscFunctions.cpp    (working copy)
@@ -59,10 +59,6 @@
        #include <errno.h>
 #endif
 
-#ifndef va_copy
-       #define va_copy(d,s) ((d) = (s))
-#endif
-
 void CoutTimestamp(bool ms) {
        time_t rawtime;
        struct tm* gmt_t;
@@ -151,8 +147,12 @@
 int MakeAnyLenString(char** ret, const char* format, ...) {
        int buf_len = 128;
     int chars = -1;
-       va_list argptr, tmpargptr;
+       va_list argptr;
        va_start(argptr, format);
+#ifndef WIN32
+       va_list tmpargptr;
+       va_copy(tmpargptr, argptr);
+#endif
        while (chars == -1 || chars >= buf_len) {
                safe_delete_array(*ret);
                if (chars == -1)
@@ -160,8 +160,10 @@
                else
                        buf_len = chars + 1;
                *ret = new char[buf_len];
-               va_copy(tmpargptr, argptr);
-               chars = vsnprintf(*ret, buf_len, format, tmpargptr);
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               chars = vsnprintf(*ret, buf_len, format, argptr);
        }
        va_end(argptr);
        return chars;
@@ -174,8 +176,12 @@
                *strlen = 0;
     int chars = -1;
        char* oldret = 0;
-       va_list argptr, tmpargptr;
+       va_list argptr;
        va_start(argptr, format);
+#ifndef WIN32
+       va_list tmpargptr;
+       va_copy(tmpargptr, argptr);
+#endif
        while (chars == -1 || chars >= (sint32)(*bufsize-*strlen)) {
                if (chars == -1)
                        *bufsize += 256;
@@ -188,8 +194,10 @@
                                memcpy(*ret, oldret, *strlen);
                        safe_delete_array(oldret);
                }
-               va_copy(tmpargptr, argptr);
-               chars = vsnprintf(&(*ret)[*strlen], (*bufsize-*strlen), format, tmpargptr);
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               chars = vsnprintf(&(*ret)[*strlen], (*bufsize-*strlen), format, argptr);
        }
        va_end(argptr);
        *strlen += chars;
Index: common/debug.cpp
===================================================================
--- common/debug.cpp    (revision 707)
+++ common/debug.cpp    (working copy)
@@ -20,10 +20,6 @@
 #endif
 #include "../common/MiscFunctions.h"
 
-#ifndef va_copy
-       #define va_copy(d,s) ((d) = (s))
-#endif
-
 static volatile bool logFileValid = false;
 static EQEMuLog realLogFile;
 EQEMuLog *LogFile = &realLogFile;
@@ -148,18 +144,29 @@
                fprintf(fp[id], "%04i [%02d.%02d. - %02d:%02d:%02d] ", getpid(), newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec);
 #endif
 
-       va_list argptr, tmpargptr;
+       va_list argptr;
        va_start(argptr, fmt);
+#ifndef WIN32
+       va_list tmpargptr;
+       va_copy(tmpargptr, argptr);
+#endif
        if (dofile) {
-               va_copy(tmpargptr, argptr);
-               vfprintf( fp[id], fmt, tmpargptr );
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               vfprintf( fp[id], fmt, argptr );
        }
        if(logCallbackFmt[id]) {
                msgCallbackFmt p = logCallbackFmt[id];
-               va_copy(tmpargptr, argptr);
-               p(id, fmt, tmpargptr );
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               p(id, fmt, argptr );
        }
     if (pLogStatus[id] & 2) {
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
                if (pLogStatus[id] & 8) {
                        fprintf(stderr, "[%s] ", LogNames[id]);
                        vfprintf( stderr, fmt, argptr );
@@ -211,7 +218,10 @@
     time( &aclock );                 /* Get time in seconds */
     newtime = localtime( &aclock );  /* Convert time to struct */
 
+#ifndef WIN32
        va_list tmpargptr;
+       va_copy(tmpargptr, argptr);
+#endif
 
     if (dofile) {
 #ifndef NO_PIDLOG
@@ -219,15 +229,22 @@
 #else
                fprintf(fp[id], "%04i [%02d.%02d. - %02d:%02d:%02d] %s", getpid(), newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, prefix);
 #endif
-               va_copy(tmpargptr, argptr);
-               vfprintf( fp[id], fmt, tmpargptr );
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               vfprintf( fp[id], fmt, argptr );
     }
        if(logCallbackPva[id]) {
                msgCallbackPva p = logCallbackPva[id];
-               va_copy(tmpargptr, argptr);
-               p(id, prefix, fmt, tmpargptr );
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               p(id, prefix, fmt, argptr );
        }
     if (pLogStatus[id] & 2) {
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
                if (pLogStatus[id] & 8) {
                        fprintf(stderr, "[%s] %s", LogNames[id], prefix);
                        vfprintf( stderr, fmt, argptr );
@@ -306,13 +323,22 @@
 }
 
 bool EQEMuLog::writeNTS(LogIDs id, bool dofile, const char *fmt, ...) {
-       va_list argptr, tmpargptr;
+       va_list argptr;
        va_start(argptr, fmt);
+#ifndef WIN32
+       va_list tmpargptr;
+       va_copy(tmpargptr, argptr);
+#endif
        if (dofile) {
-               va_copy(tmpargptr, argptr);
-               vfprintf( fp[id], fmt, tmpargptr );
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
+               vfprintf( fp[id], fmt, argptr );
        }
     if (pLogStatus[id] & 2) {
+#ifndef WIN32
+               va_copy(argptr, tmpargptr);
+#endif
                if (pLogStatus[id] & 8)
                        vfprintf( stderr, fmt, argptr );
                else