Changeset 355 for trunk/dll/printer.c

Timestamp:

Jul 26, 2006, 9:58:11 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/printer.c (modified) (13 diffs)

trunk/dll/printer.c

@@ -4 +4 @@
   $Id$
 
+  Print file list
+
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004 Steven H.Levine
-
-  Revisions     01 Aug 04 SHL - Rework lstrip/rstrip usage
+  Copyright (c) 2004, 2006 Steven H.Levine
+
+  01 Aug 04 SHL Rework lstrip/rstrip usage
+  17 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -27 +30 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(PRINTER,PrinterReady,SayPrinterReady)
 #pragma alloc_text(PRINTER2,PrintList)
@@ -34 +40 @@
 
 
-BOOL PrinterReady (CHAR *printdevname) {
-
+BOOL PrinterReady (CHAR *printdevname)
+{
   FILE *          printhandle;
   CHAR            param = 0,
@@ -46 +52 @@
     return TRUE;
   DosError(FERR_DISABLEHARDERR);
-  printhandle = fopen(printdevname,"a+");
-  if(printhandle) {
+  printhandle = xfopen(printdevname,"a+",pszSrcFile,__LINE__);
+  if (printhandle) {
     if(!strnicmp(printdevname,"COM",3) && isdigit(printdevname[3])) {
       fclose(printhandle);
@@ -71 +77 @@
 
 
-BOOL SayPrinterReady (HWND hwnd) {
-
+BOOL SayPrinterReady (HWND hwnd)
+{
   if(!hwnd)
     hwnd = HWND_DESKTOP;
@@ -86 +92 @@
 
 
-VOID PrintList (VOID *arg) { /* background-print a list of files */
-
+//=== PrintList - background-print a list of files ===
+
+VOID PrintList (VOID *arg)
+{
   HAB          hab2;
   HMQ          hmq2;
@@ -104 +112 @@
   if(!PrintSem) {
     if(DosCreateMutexSem(NULL,&PrintSem,0,FALSE)) {
-      DosBeep(250,100);
+      Dos_Error(MB_CANCEL,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DosCreateMutexSem");
       goto Abort;
     }
@@ -130 +138 @@
           if(StopPrinting)
             break;
-          if(PrinterReady(li->targetpath)) {
+          if (!PrinterReady(li->targetpath))
+            Runtime_Error(pszSrcFile, __LINE__, "printer %s error", li->targetpath);
+          else {
             fpi = _fsopen(li->list[x],"r",SH_DENYWR);
-            if(fpi) {
+            if (!fpi)
+              Runtime_Error(pszSrcFile, __LINE__, "cannot open %s",li->list[x]);
+            else {
               fpo = _fsopen(li->targetpath,"a+",SH_DENYRW);
-              if(fpo) {
+              if(!fpo)
+                Runtime_Error(pszSrcFile, __LINE__, "cannot open %s",li->targetpath);
+              else {
                 sprintf(s,
                         GetPString(IDS_PRINTINGTEXT),
@@ -298 +312 @@
                 fclose(fpo);
               }
-              else
-                DosBeep(50,100);
               fclose(fpi);
             }
-            else
-              DosBeep(50,100);
-          }
-          else {
-            DosBeep(50,100);
-            DosBeep(250,100);
           }
           DosReleaseMutexSem(PrintSem);
@@ -327 +333 @@
 
 
-MRESULT EXPENTRY PrintDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY PrintDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   LISTINFO *li;
 
@@ -388 +394 @@
       WinSetDlgItemText(hwnd,PRN_PRINTER,printer);
       WinSendDlgItemMsg(hwnd,PRN_LISTBOX,LM_DELETEALL,MPVOID,MPVOID);
-      li = WinQueryWindowPtr(hwnd,0);
-      if(li) {
-
+      li = WinQueryWindowPtr(hwnd,QWL_USER);
+      if (!li)
+        Runtime_Error(pszSrcFile, __LINE__, "no data");
+      else {
         INT x;
 
@@ -438 +445 @@
       switch(SHORT1FROMMP(mp1)) {
         case DID_OK:
-          li = WinQueryWindowPtr(hwnd,0);
-          if(li) {
+          li = WinQueryWindowPtr(hwnd,QWL_USER);
+          if (!li)
+            Runtime_Error(pszSrcFile, __LINE__, "no data");
+          else {
             prnformat         = WinQueryButtonCheckstate(hwnd,PRN_FORMAT);
             PrfWriteProfileData(fmprof,FM3Str,"Prnformat",
@@ -576 +585 @@
                   error = AddToList(szBuffer,&li->list,&numfiles,&numalloc);
                   if(error) {
-                    DosBeep(250,100);
+                    Runtime_Error(pszSrcFile, __LINE__, "AddToList");
                     break;
                   }