Changeset 347 for trunk/dll/command.c

Timestamp:

Jul 26, 2006, 7:43:28 AM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/command.c (modified) (25 diffs)

trunk/dll/command.c

@@ -4 +4 @@
   $Id$
 
+  Custom commands
+
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2005 Steven H. Levine
+  Copyright (c) 2004, 2006 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
   06 Jun 05 SHL Drop unused code
+  14 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -14 +17 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -21 +24 @@
 #include <ctype.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -33 +37 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(COMMAND,command_title,free_commands,add_command,kill_command)
 #pragma alloc_text(COMMAND,CommandDlgProc,EditCommands,ReOrderProc,CommandTextProc)
 
 
-MRESULT EXPENTRY CommandTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CommandTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   PFNWP       oldproc = (PFNWP)WinQueryWindowPtr(hwnd,0);
   static BOOL emphasized = FALSE;
@@ -87 +94 @@
 
 
-MRESULT EXPENTRY ReOrderProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ReOrderProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG:
@@ -104 +111 @@
                                        MPFROMSHORT(LIT_END),
                                        MPFROMP(info->title));
-          if(x >= 0)
+          if(x < 0) {
+            Runtime_Error(pszSrcFile, __LINE__, "no cmd");
+            WinDismissDlg(hwnd,0);
+          }
+          else {
             WinSendDlgItemMsg(hwnd,RE_ADDLISTBOX,LM_SETITEMHANDLE,
                               MPFROMSHORT(x),MPFROMP(info));
-          else {
-            DosBeep(50,100);
-            WinDismissDlg(hwnd,0);
-          }
+          }
           info = info->next;
         }
@@ -275 +283 @@
 
 
-CHAR *command_title (INT cx) {
-
+CHAR *command_title (INT cx)
+{
   static CHAR  duh[] = "???";
   LINKCMDS    *info;
@@ -293 +301 @@
 
 
-VOID free_commands (VOID) {
-
+VOID free_commands (VOID)
+{
   LINKCMDS *info,*next;
 
@@ -309 +317 @@
 
 
-VOID load_commands (VOID) {
-
+VOID load_commands (VOID)
+{
   FILE     *fp;
   LINKCMDS *info;
@@ -342 +350 @@
       if(!*cl)
         continue;
-      info = malloc(sizeof(LINKCMDS));
+      info = xmallocz(sizeof(LINKCMDS),pszSrcFile,__LINE__);
       if(info) {
-        memset(info,0,sizeof(LINKCMDS));
-        info->cl = strdup(cl);
-        info->title = strdup(title);
+        info->cl = xstrdup(cl,pszSrcFile,__LINE__);
+        info->title = xstrdup(title,pszSrcFile,__LINE__);
         info->flags = atol(flags);
         if(!info->cl || !info->title) {
@@ -370 +377 @@
 
 
-VOID save_commands (VOID) {
-
+VOID save_commands (VOID)
+{
   LINKCMDS *info;
   FILE     *fp;
@@ -383 +390 @@
     strcat(s,"\\");
   strcat(s,"COMMANDS.DAT");
-  fp = fopen(s,"w");
-  if(fp) {
+  fp = xfopen(s,"w",pszSrcFile,__LINE__);
+  if (fp) {
     fputs(GetPString(IDS_COMMANDFILETEXT),fp);
     info = cmdhead;
@@ -400 +407 @@
 
 
-LINKCMDS * add_command (COMMAND *addme) {
-
+LINKCMDS * add_command (COMMAND *addme)
+{
   LINKCMDS *info;
 
@@ -412 +419 @@
     }
     if(!info) {
-      info = malloc(sizeof(LINKCMDS));
+      info = xmallocz(sizeof(LINKCMDS),pszSrcFile,__LINE__);
       if(info) {
-        memset(info,0,sizeof(LINKCMDS));
-        info->cl = strdup(addme->cl);
-        info->title = strdup(addme->title);
+        info->cl = xstrdup(addme->cl,pszSrcFile,__LINE__);
+        info->title = xstrdup(addme->title,pszSrcFile,__LINE__);
         if(addme->flags)
           info->flags = addme->flags;
@@ -443 +449 @@
 
 
-BOOL kill_command (CHAR *killme) {
-
+BOOL kill_command (CHAR *killme)
+{
   LINKCMDS *info;
 
@@ -476 +482 @@
 
 
-MRESULT EXPENTRY CommandDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CommandDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   SHORT     x;
   LINKCMDS *info;
@@ -530 +536 @@
                                                    MPVOID);
               if(!info) {
-                DosBeep(50,100);
+                Runtime_Error(pszSrcFile, __LINE__, "LM_QUERYITEMHANDLE");
                 break;
               }
@@ -584 +590 @@
         case CMD_REORDER:
           if(!cmdhead || !cmdhead->next) {
-            DosBeep(250,100);
+            Runtime_Error(pszSrcFile, __LINE__, "no cmd");
             break;
           }
@@ -682 +688 @@
               temp.flags |= ONCE;
             info = add_command(&temp);
-            if(info) {
+            if(!info)
+              Runtime_Error(pszSrcFile, __LINE__, "add_command");
+            else {
               {
                 CHAR env[1002];
@@ -717 +725 @@
               }
             }
-            else
-              DosBeep(50,200);
           }
           break;
@@ -728 +734 @@
             WinQueryDlgItemText(hwnd,CMD_TITLE,34,temp);
             bstrip(temp);
-            if(kill_command(temp)) {
+            if (!kill_command(temp))
+              Runtime_Error(pszSrcFile, __LINE__, "kill_command");
+            else {
               x = (SHORT)WinSendDlgItemMsg(hwnd,
                                            CMD_LISTBOX,
@@ -748 +756 @@
               save_commands();
             }
-            else
-              DosBeep(50,200);
           }
           break;
@@ -759 +765 @@
 
 
-VOID RunCommand (HWND hwnd,INT cx) {
-
+VOID RunCommand (HWND hwnd,INT cx)
+{
   INT          x;
   CHAR       **list;
@@ -819 +825 @@
 
 
-VOID EditCommands (HWND hwnd) {
-
+VOID EditCommands (HWND hwnd)
+{
   static CHAR stop = 0;
 
@@ -836 +842 @@
   stop = 0;
 }
-