Changeset 4707 for trunk/src

Timestamp:

Nov 29, 2000, 5:36:27 AM (25 years ago)

Author:

bird

Message:

Corrected two problems.

1) Bootdriveletter jumped for each save.
2) Shrinking of config.sys due to parameters removed.

File:

• trunk/src/win32k/utils/Win32kCC.c (modified) (7 diffs)

trunk/src/win32k/utils/Win32kCC.c

@@ -1 @@
-/* $Id: Win32kCC.c,v 1.4 2000-11-26 13:36:51 bird Exp $
+/* $Id: Win32kCC.c,v 1.5 2000-11-29 04:36:27 bird Exp $
  *
  * Win32CC - Win32k Control Center.
@@ -44 +44 @@
 #include <stdarg.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include <Win32k.h>
@@ -333 +334 @@
                     char *  pszConfigSys = "A:\\Config.sys";
                     char    szArgs[120];
+                    int     cchArgs;
 
                     if (!WinSendMsg(hwnd, WM_QUERYCONTROLS, (MPARAM)TRUE, NULL))
@@ -364 +366 @@
                         sprintf(szArgs + strlen(szArgs), " -ResHeapMax:%d", pThis->NewOptions.cbResHeapMax); /* FIXME - to be changed */
                     strcat(szArgs, "\n");
+                    cchArgs = strlen(szArgs);
 
                     /*
                      * Update Config.sys.
                      */
-                    *pszConfigSys += ulBootDrv - 1;
+                    *pszConfigSys = ulBootDrv - 1 + 'A';
                     phConfigSys = fopen(pszConfigSys, "r+");
                     if (phConfigSys)
@@ -380 +383 @@
                             char *  pszConfigSys;
 
-                            cbConfigSys += 1024;
-                            pszConfigSys = (char*)calloc(1, cbConfigSys);
+                            pszConfigSys = (char*)calloc(1, 2 * (cbConfigSys + 256)); /* Paranoia... */
                             if (pszConfigSys)
                             {
@@ -395 +397 @@
                                     pszWin32k = stristr(pszCurrent, "win32k.sys");
                                     if (pszWin32k)
-                                        strcpy(pszWin32k + 10, szArgs);
+                                    {
+                                        int cch;
+                                        pszWin32k += 10;  /* skip "win32k.sys" */
+                                        cch = strlen(pszWin32k);
+                                        strcpy(pszWin32k, szArgs);
+                                        if (cchArgs < cch)
+                                        { /* fix which stops us from shrinking the file.. */
+                                            memset(pszWin32k + cchArgs - 1, ' ', cch - cchArgs);
+                                            pszWin32k[cch - 1] = '\n';
+                                            pszWin32k[cch]     = '\0';
+                                        }
+                                    }
 
                                     /* next */
                                     pszCurrent += strlen(pszCurrent);
                                 }
-
-                                /* Write it back */
+                                if (pszCurrent[-1] != '\n')
+                                    *pszCurrent++ = '\n';
+
+                                /* Write it back
+                                 * One big question, how do we shrink a file?
+                                 */
                                 if (    fseek(phConfigSys, 0, SEEK_SET) == 0
                                     &&  fwrite(pszConfigSys, 1, pszCurrent - pszConfigSys, phConfigSys))
@@ -409 +426 @@
                                 else
                                     Complain(hwnd, IDS_FWRITE_FAILED, pszConfigSys);
+                                free(pszConfigSys);
                             }
                             else