Changeset 989 for trunk/dll/assoc.c

Timestamp:

Mar 2, 2008, 12:34:12 AM (18 years ago)

Author:

Gregg Young

Message:

Refactor fm3dll.h to create command.h; broken ini is now replaced with backup or new ini as available; more variable command line ledth changes

File:

• trunk/dll/assoc.c (modified) (2 diffs)

trunk/dll/assoc.c

@@ -275 +275 @@
     while (info) {
       fprintf(fp,
-              ";\n%0.*s\n%0.4096s\n%0.*s\n%lu\n%lu\n",
+              ";\n%0.*s\n%0.*s\n%0.*s\n%lu\n%lu\n",
               CCHMAXPATH,
-              info->mask,
+              info->mask,
+              MaxComLineStrg,
               info->pszCmdLine,
               CCHMAXPATH,
@@ -510 +511 @@
   case UM_UNDO:
     {
-      CHAR s[4096];
-
-      WinSendDlgItemMsg(hwnd, ASS_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-      info = asshead;
-      while (info) {
-        sprintf(s,
-                "%-12s \x1a %-24s %s%s%s",
-                info->mask,
-                info->pszCmdLine,
-                (info->sig && *info->sig) ?
-                "[" : NullStr,
-                (info->sig && *info->sig) ? info->sig : NullStr,
-                (info->sig && *info->sig) ? "]" : NullStr);
-        x = (SHORT) WinSendDlgItemMsg(hwnd,
-                                      ASS_LISTBOX,
-                                      LM_INSERTITEM,
-                                      MPFROM2SHORT(LIT_END, 0), MPFROMP(s));
-        if (x >= 0)
-          WinSendDlgItemMsg(hwnd,
-                            ASS_LISTBOX,
-                            LM_SETITEMHANDLE, MPFROMSHORT(x), MPFROMP(info));
-        info = info->next;
-      }
-      WinSendDlgItemMsg(hwnd,
-                        ASS_LISTBOX,
-                        LM_SELECTITEM, MPFROMSHORT(0), MPFROMSHORT(TRUE));
+      PSZ pszDisplayStr;
+
+      pszDisplayStr = xmallocz((CCHMAXPATH * 2) + MaxComLineStrg + 6,
+                               pszSrcFile, __LINE__);
+      if (pszDisplayStr) {
+        WinSendDlgItemMsg(hwnd, ASS_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
+        info = asshead;
+        while (info) {
+          sprintf(pszDisplayStr,
+                  "%-12s \x1a %-24s %s%s%s",
+                  info->mask,
+                  info->pszCmdLine,
+                  (info->sig && *info->sig) ?
+                  "[" : NullStr,
+                  (info->sig && *info->sig) ? info->sig : NullStr,
+                  (info->sig && *info->sig) ? "]" : NullStr);
+          x = (SHORT) WinSendDlgItemMsg(hwnd,
+                                        ASS_LISTBOX,
+                                        LM_INSERTITEM,
+                                        MPFROM2SHORT(LIT_END, 0), MPFROMP(pszDisplayStr));
+          if (x >= 0)
+            WinSendDlgItemMsg(hwnd,
+                              ASS_LISTBOX,
+                              LM_SETITEMHANDLE, MPFROMSHORT(x), MPFROMP(info));
+          info = info->next;
+        }
+        WinSendDlgItemMsg(hwnd,
+                          ASS_LISTBOX,
+                          LM_SELECTITEM, MPFROMSHORT(0), MPFROMSHORT(TRUE));
+        xfree(pszDisplayStr);
+      }
     }
     return 0;