Changeset 356 for trunk/dll/notify.c

Timestamp:

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

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/notify.c (modified) (14 diffs)

trunk/dll/notify.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Notifications
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2006 Steven H.Levine
+
+  17 Jul 06 SHL Use Win_Error
+  22 Jul 06 SHL Check more run time errors
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
 #define INCL_GPI
-
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -11 +26 @@
 #include <time.h>
 #include <stddef.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -16 +32 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(NOTIFY,Notify,NotifyWndProc,StartNotify)
 #pragma alloc_text(NOTIFY,NotifyThread,NotifyError)
@@ -23 +42 @@
 static HWND hwndNotify;
 
-
-MRESULT EXPENTRY NotifyWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY NotifyWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   static ULONG showing = 0;
 
@@ -39 +57 @@
                           ID_TIMER2,
                           5000)) {
-          DosBeep(50,100);
+          Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"WinStartTimer");
           WinDestroyWindow(hwnd);
         }
@@ -125 +143 @@
 
 
-HWND DoNotify (char *str) {
-
+HWND DoNotify (char *str)
+{
   char          *p;
   HWND          hwnd = (HWND)0,hwndP;
@@ -157 +175 @@
     /* pretty-up the note by putting on a leading space */
     if(*str != ' ') {
-      p = malloc(strlen(str) + 2);
+      p = xmalloc(strlen(str) + 2,pszSrcFile,__LINE__);
       if(!p)
         p = str;
@@ -193 +211 @@
 
 
-HWND Notify (char *str) {
-
+HWND Notify (char *str)
+{
   return (HWND)WinSendMsg(MainObjectHwnd,UM_NOTIFY,MPFROMP(str),MPVOID);
 }
 
 
-VOID NotifyError (CHAR *filename,APIRET status) {
-
+VOID NotifyError (CHAR *filename,APIRET status)
+{
   CHAR errortext[512];
 
@@ -241 +259 @@
 
 
-MRESULT EXPENTRY NoteWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY NoteWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   static HPOINTER hptrIcon = (HPOINTER)0;
 
@@ -459 +477 @@
 
 
-VOID NoteThread (VOID *args) {
-
+VOID NoteThread (VOID *args)
+{
   HAB    hab2;
   HMQ    hmq2;
@@ -482 +500 @@
 
 
-BOOL StartNotes (CHAR *note) {
-
-  if(!hwndNotify) {
-    if(_beginthread(NoteThread,
-                    NULL,
-                    65536,
-                    (PVOID)note) != -1)
-      return TRUE;
-  }
-  else
-    return TRUE;
-  return FALSE;
-}
-
-
-BOOL AddNote (CHAR *note) {
-
+VOID StartNotes (CHAR *note)
+{
+  if (!hwndNotify) {
+    if (_beginthread(NoteThread,NULL,65536,(PVOID)note) == -1)
+      Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
+  }
+}
+
+
+BOOL AddNote (CHAR *note)
+{
   CHAR *s,*p;
   BOOL  once = FALSE,ret = FALSE;
@@ -549 +561 @@
 
 
-VOID EndNote (VOID) {
-
+VOID EndNote (VOID)
+{
   if(hwndNotify)
     if(!PostMsg(hwndNotify,
@@ -563 +575 @@
 
 
-VOID ShowNote (VOID) {
-
+VOID ShowNote (VOID)
+{
   if(!hwndNotify)
     StartNotes(NULL);
@@ -581 +593 @@
 
 
-VOID HideNote (VOID) {
-
+VOID HideNote (VOID)
+{
   if(hwndNotify)
     WinSetWindowPos(hwndNotify,