From 5423bf8a940955bcbc5cb724d07ea22c4131d4ef Mon Sep 17 00:00:00 2001
From: codemastr <devnull@localhost>
Date: Sat, 21 Apr 2001 17:06:07 +0000
Subject: [PATCH] Win32 changes

---
 Changes              | 2 ++
 src/win32/Win32GUI.c | 4 ++--
 src/win32/resource.h | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 4c7688a40..1fba4f1bd 100644
--- a/Changes
+++ b/Changes
@@ -435,3 +435,5 @@
 - Changed some non-error messages in newconf from config_status to config_progress
 - Added a way for newconf to report its errors in windows using a "Config Error" dialog
 - Fixed the /stats Z bug reported by RaYmAn
+- Added missing resource.h defineand missing +1 in MyMalloc of win_log reported by McSkaf
+  Seemed to work without the +1 but added it just to be safe.
diff --git a/src/win32/Win32GUI.c b/src/win32/Win32GUI.c
index 72530ce05..2cde5a83e 100644
--- a/src/win32/Win32GUI.c
+++ b/src/win32/Win32GUI.c
@@ -842,12 +842,12 @@ void win_log(char *format, ...) {
         ircvsprintf(buf, format, ap);
 	strcat(buf, "\r\n");
 	if (errors) {
-		buf2 = MyMalloc(strlen(errors)+strlen(buf));
+		buf2 = MyMalloc(strlen(errors)+strlen(buf)+1);
 		sprintf(buf2, "%s%s",errors,buf);
 		MyFree(errors);
 	}
 	else {
-		buf2 = MyMalloc(strlen(buf));
+		buf2 = MyMalloc(strlen(buf)+1);
 		sprintf(buf2, "%s",buf);
 	}
 	errors = buf2;
diff --git a/src/win32/resource.h b/src/win32/resource.h
index 40bac8458..0b867642f 100644
--- a/src/win32/resource.h
+++ b/src/win32/resource.h
@@ -25,6 +25,7 @@
 #define IDC_LSERVERS                    1123
 #define IDC_LMAXCLIENTS                 1124
 #define IDC_UPTIME                      1125
+#define IDC_CONFIGERROR                 1126
 #define IDM_CREDITS                     40027
 #define IDM_DAL                         40028
 #define IDM_LICENSE                     40029