From 161136cd579a8dff689933bd99fe5ec374d33ac5 Mon Sep 17 00:00:00 2001
From: John Bintz <hello@theindustriousrabbit.com>
Date: Wed, 5 Oct 2022 17:59:05 -0400
Subject: [PATCH] clean up memory leaks

---
 main   | Bin 8976 -> 9000 bytes
 main.c |  69 ++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/main b/main
index a11839ace799be79e8b033a8fc5e89643cce2d3f..0ce566d76fd3e835ef27321e741b4f664ff9aa35 100755
GIT binary patch
delta 3459
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
aK9CCXLS5Ppf0RR@UXj(FVIDE1>Hh&Pei^6$

delta 3442
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
L_B8W~Sxx^hgiQXZ

diff --git a/main.c b/main.c
index 3013afc..1bc9ada 100644
--- a/main.c
+++ b/main.c
@@ -70,7 +70,7 @@ struct NewWindow aboutWindowLayout = {
   40, 40,
   ABOUT_WINDOW_WIDTH, ABOUT_WINDOW_HEIGHT,
   0, 1,
-  IDCMP_REFRESHWINDOW | IDCMP_CLOSEWINDOW | BUTTONIDCMP,
+  IDCMP_CLOSEWINDOW,
   WFLG_DRAGBAR | WFLG_DEPTHGADGET | WFLG_CLOSEGADGET | WFLG_ACTIVATE,
   NULL,
   NULL,
@@ -133,6 +133,7 @@ struct Menu *menu;
 struct Device *TimerBase;
 struct timerequest *TimerIO;
 struct timeval currentSystemTime;
+struct MsgPort *timerPort;
 
 // sound stuff
 // get that bell
@@ -155,6 +156,7 @@ ULONG timerStartTime = 0, timerDistance, timerBuild;
 BOOL timerIsRunning = FALSE;
 BOOL timerStarted = FALSE;
 BOOL terminated = FALSE;
+BOOL openAboutWindowNext = FALSE;
 
 /**
  * Initialize system stuff.
@@ -163,8 +165,6 @@ BOOL terminated = FALSE;
 // parameter.
 // http://www.hipooniosamigasite.org/amigadocs/files/LOON-DOCS-DISKS/LOON5/LatticeC.pt3
 int setup(void) {
-  struct MsgPort *timerPort;
-
   // make sure the font exists on the computer
   // http://amigadev.elowar.com/read/ADCD_2.1/Includes_and_Autodocs_3._guide/node0308.html
   if (NULL == (topaz80Font = OpenFont(&Topaz80))) {
@@ -218,15 +218,12 @@ int setup(void) {
  */
 void teardown(void) {
   // http://amigadev.elowar.com/read/ADCD_2.1/Devices_Manual_guide/node0196.html
-  struct MsgPort *tempTimerPort;
-
   if (TimerIO) {
     CloseDevice((struct IORequest *)TimerIO);
-    tempTimerPort = TimerIO->tr_node.io_Message.mn_ReplyPort;
-
-    if (tempTimerPort) {
-      DeletePort(tempTimerPort);
-    }
+    DeleteExtIO((struct IORequest *)TimerIO);
+  }
+  if (timerPort) {
+    DeletePort(timerPort);
   }
   // all right, then. keep your secrets.
   if (visualInfo) FreeVisualInfo(visualInfo);
@@ -527,6 +524,14 @@ int openAboutWindow(void) {
 
   ULONG windowSignal;
   BOOL closeAbout = FALSE;
+
+  // Something is causing a small memory leak when I do this and I don't know
+  // what it is. CodeWatcher reports a bunch of 40 byte blocks, most likely
+  // Intuition messages.
+  //
+  // nope, false positive, checked with avail before and after running and
+  // the used/free counts are exactly the same:
+  // https://eab.abime.net/showthread.php?t=104360
   aboutWindow = OpenWindow(&aboutWindowLayout);
 
   if (!aboutWindow) {
@@ -584,16 +589,21 @@ int openAboutWindow(void) {
   while (!closeAbout) {
     Wait(windowSignal);
 
-    while (!closeAbout && (iMessage = GT_GetIMsg(aboutWindow->UserPort))) {
-      switch (iMessage->Class) {
-        case IDCMP_CLOSEWINDOW:
-          closeAbout = TRUE;
-          break;
-        case IDCMP_REFRESHWINDOW:
-          GT_BeginRefresh(window);
-          GT_EndRefresh(window, TRUE);
-          break;
+    while (iMessage = GT_GetIMsg(aboutWindow->UserPort)) {
+      if (!closeAbout) {
+        switch (iMessage->Class) {
+          case IDCMP_CLOSEWINDOW:
+            closeAbout = TRUE;
+            break;
+          case IDCMP_REFRESHWINDOW:
+            GT_BeginRefresh(window);
+            GT_EndRefresh(window, TRUE);
+            break;
+        }
       }
+
+      // ensure messages are garbage collected
+      GT_ReplyIMsg(iMessage);
     }
   }
 
@@ -648,10 +658,7 @@ void handleIntuitionMessage(struct IntuiMessage *iMessage) {
           terminated = TRUE;
           break;
         case MENU_ABOUT_ID:
-          // yes, this blocks, deal with it
-          // it also returns non-zero if something goes wrong.
-          // in that case, kill the program
-          if (openAboutWindow()) terminated = TRUE;
+          openAboutWindowNext = TRUE;
           break;
       }
       break;
@@ -833,14 +840,26 @@ int main() {
 
     if (foundSignals & windowSignal) {
       // drain the window event queue
-      while ((!terminated) && (iMessage = GT_GetIMsg(window->UserPort))) {
-        handleIntuitionMessage(iMessage);
+      while (iMessage = GT_GetIMsg(window->UserPort)) {
+        if (!terminated) {
+          handleIntuitionMessage(iMessage);
+        }
+
+        // if we don't reply, the event won't be garbage collected.
+        // we still have to drain any other messages that show up
+        GT_ReplyIMsg(iMessage);
       }
     }
 
     if ((foundSignals & timerSignal) && timerIsRunning) {
       handleTimerMessage();
     }
+
+    if (openAboutWindowNext) {
+      if (openAboutWindow()) terminated = TRUE;
+
+      openAboutWindowNext = FALSE;
+    }
   }
 
   clearUI();