Changeset 1007

Timestamp:

Jul 4, 2014, 5:42:25 PM (10 years ago)

Author:

alloc

Message:

Daodan 3.8: Fix msvcrt incompatibility on XP

Location:

Daodan/src

Files:

• Daodan_Config.c (modified) (4 diffs)
• _Version.h (modified) (1 diff)

Daodan/src/Daodan_Config.c

@@ -19 +19 @@
 static const char* defaultSection = "options";
 
-static char invalidCurParamaters[1000] = "";
-static char invalidTotalParamaters[3000] = "";
+static char invalidCurParamaters[2000] = "";
+static char invalidTotalParamaters[4000] = "";
 
 void DDrConfig_PrintHelp();
@@ -531 +531 @@
                 }
         } else {
-                char buf[50];
+                char buf[100];
                 if (!_stricmp(section, "*"))
-                        sprintf_s(buf, sizeof(buf), "  %s\n", name);
+                        sprintf(buf, "  %s\n", name);
                 else
-                        sprintf_s(buf, sizeof(buf), "  %s.%s\n", section, name);
+                        sprintf(buf, "  %s.%s\n", section, name);
                 if (strlen(buf) + strlen(invalidCurParamaters) < sizeof(invalidCurParamaters) - 1) {
                         strcpy(invalidCurParamaters + strlen(invalidCurParamaters), buf);
@@ -593 +593 @@
         if (strlen(invalidCurParamaters) > 0)
         {
-                sprintf_s(invalidTotalParamaters, sizeof(invalidTotalParamaters), "In %s:\n%s\n", iniName, invalidCurParamaters);
+                sprintf(invalidTotalParamaters, "In %s:\n%s\n", iniName, invalidCurParamaters);
                 invalidCurParamaters[0] = 0;
         }
@@ -603 +603 @@
         if (strlen(invalidCurParamaters) > 0)
         {
-                sprintf_s(invalidTotalParamaters, sizeof(invalidTotalParamaters), "%sOn command line:\n%s\n", invalidTotalParamaters, invalidCurParamaters);
+                sprintf(invalidTotalParamaters, "%sOn command line:\n%s\n", invalidTotalParamaters, invalidCurParamaters);
         }
 
         if (strlen(invalidTotalParamaters) > 0)
         {
-                char msg[3200];
-                sprintf_s(msg, sizeof(msg), "Invalid parameters given:\n%sContinue launching Oni?", invalidTotalParamaters);
+                char msg[4096];
+                sprintf(msg, "Invalid parameters given:\n%sContinue launching Oni?", invalidTotalParamaters);
                 int res = MessageBox(NULL, msg, "Parameters invalid", MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON1);
                 if (res == IDNO) {

Daodan/src/_Version.h

@@ -6 +6 @@
 
 #define DAODAN_VERSION_MAJOR 3
-#define DAODAN_VERSION_MINOR 7
+#define DAODAN_VERSION_MINOR 8
 #define DAODAN_VERSION_STRING STRINGIZE(DAODAN_VERSION_MAJOR) "." STRINGIZE(DAODAN_VERSION_MINOR)