Use malloc, not GEMDOS Malloc for cf_malloc(FALSE)

See #5

Author: th-otto

backgrd.c

@@ -72,7 +72,7 @@ static void cf_background(GRECT *box, MFDB *buffer, _WORD get)
 				xy[6] = r.g_x + r.g_w - 1;
 				xy[7] = r.g_y + r.g_h - 1;
 				vro_cpyfm(cf_vdi_handle, S_ONLY, xy, buffer, &screen);
-				Mfree(buffer->fd_addr);
+				free(buffer->fd_addr);
 			}
 			show_mouse();
 		}

cfmalloc.c

@@ -34,7 +34,7 @@ void *cf_malloc(long size, char *who, int global)
 	if (global && getcookie("MiNT", NULL))
 		r = (void *)Mxalloc(size, 0x23);
 	else
-		r = (void *)Malloc(size);
+		r = (void *)malloc(size);
 
 	if (r == NULL)
 	{

cicon.c

@@ -211,16 +211,16 @@ CICON *fix_cicon(CICONBLK *cicnblk, _WORD screen_planes, _WORD handle)
 
 	if (best_icn != NULL)			/* passendes Farbicon gefunden */
 	{
-		new_icn = (CICON*)cf_malloc(sizeof(CICON), "fix_cicon", FALSE);
+		new_icn = (CICON*)cf_malloc(sizeof(CICON), "fix_cicon", FALSE); /* leaked */
 		*new_icn = *best_icn;
 
 		if (best_planes > 1)
 			new_icn->num_planes = screen_planes;
 		else
 			new_icn->num_planes = 1;
 
-		new_icn->col_data = cf_malloc(len * screen_planes, "fix_cicon", FALSE);
-		new_icn->sel_data = cf_malloc(len * screen_planes, "fix_cicon", FALSE);
+		new_icn->col_data = cf_malloc(len * screen_planes, "fix_cicon", FALSE); /* leaked */
+		new_icn->sel_data = cf_malloc(len * screen_planes, "fix_cicon", FALSE); /* leaked */
 
 		if (best_planes > 1)
 		{
@@ -259,8 +259,8 @@ CICON *fix_cicon(CICONBLK *cicnblk, _WORD screen_planes, _WORD handle)
 			d.fd_addr = new_icn->sel_data;
 			vr_trnfm(handle, &s, &d);
 
-			Mfree(buf2);
-			Mfree(buf1);
+			free(buf2);
+			free(buf1);
 		}
 		else
 		{

filesel.c

@@ -276,7 +276,7 @@ int select_file(char *path, char *name, char *mask, char *title, FSEL_CB open_cb
 			}
 			for (i = 0; i < SLCT_ANZ; i++)
 				if (files[i] != NULL)
-					Mfree(files[i]);
+					free(files[i]);
 
 			/* leeren */
 			path[0] = '\0';

mdclose.c

@@ -70,6 +70,6 @@ void close_mdial(MDIAL *dial)
 		dial->tree[0].ob_y += dial->delta_y;
 
 		__mdial_md_list = dial->next;
-		Mfree(dial);
+		free(dial);
 	}
 }

ppfree.c

@@ -41,7 +41,7 @@ _WORD free_popup(POPUP *p)
 			free((char *)get_obspec(p->tree, i));	/* free_string freigeben */
 	} while (!(p->tree[i].ob_flags & OF_LASTOB));
 
-	Mfree(p->tree);
+	free(p->tree);
 
 	return TRUE;
 }

userdef.c

@@ -459,31 +459,75 @@ static void init_inline_rsc(void)
 	check_cib->mainlist = fix_cicon(check_cib, i, handle);
 }
 
-static void make_userdef(OBJECT *tree, _WORD obj, _WORD __CDECL (*proc)(PARMBLK *p))
+static void make_userdef(USERBLK *uPtr, OBJECT *tree, _WORD obj, _WORD __CDECL (*proc)(PARMBLK *p))
 {
-	USERBLK *uPtr;
-
-	uPtr = (USERBLK *)cf_malloc(sizeof(USERBLK), "make_userdef", FALSE);
-	if (uPtr != NULL)
-	{
-		uPtr->ub_code = proc;						/* neue Zeichenfunktion */
-		uPtr->ub_parm = tree[obj].ob_spec.index;	/* alte obSpec sichern */
+	uPtr->ub_code = proc;						/* neue Zeichenfunktion */
+	uPtr->ub_parm = tree[obj].ob_spec.index;	/* alte obSpec sichern */
 
-		/* alten Typ hochschieben und neuen eintragen */
-		tree[obj].ob_type = (tree[obj].ob_type << 8) | G_USERDEF;
-		tree[obj].ob_spec.userblk = uPtr;			/* Userblock eintragen */
-	}
+	/* alten Typ hochschieben und neuen eintragen */
+	tree[obj].ob_type = (tree[obj].ob_type << 8) | G_USERDEF;
+	tree[obj].ob_spec.userblk = uPtr;			/* Userblock eintragen */
 }
 
 /* -- exportierte Funtkionen ------------------------------------------------- */
 
 void fix_dial(OBJECT *tree)
 {
 	_WORD mtyp, obj;
+	USERBLK *uPtr;
+	_WORD count;
 
 	if (!tree)
 		return;
 
+	/* first pass: count number of USERBLKs needed */
+	obj = -1;
+	count = 0;
+	do
+	{
+		obj++;
+		mtyp = get_magx_obj(tree, obj);
+
+		/* Ein paar Erweiterungen, die MagiC auch nicht kann */
+		switch (mtyp)
+		{
+			case MX_GROUPBOX2:
+				count++;
+				break;
+		}
+
+		/* den Rest nur, wenn keine WHITEBACK-Buttons verfgbar sind */
+		if (!mx_buttons || use_all_userdefs)
+		{
+			switch (mtyp)
+			{
+				case MX_UNDERLINE:
+					count++;
+					break;
+				case MX_GROUPBOX:
+					count++;
+					break;
+				case MX_RADIO:
+				case MX_SCRADIO:
+					count++;
+					break;
+				case MX_CHECK:
+				case MX_SCCHECK:
+					count++;
+					break;
+				case MX_SCSTRING:
+					count++;
+					break;
+			}
+		}
+	} while (!(tree[obj].ob_flags & OF_LASTOB));
+
+	if (count == 0)
+		return;
+
+	uPtr = (USERBLK *)cf_malloc(count * sizeof(USERBLK), "fix_dial", FALSE); /* leaked */
+
+	/* 2nd pass: construct USERBLKs */
 	obj = -1;
 	do
 	{
@@ -494,32 +538,37 @@ void fix_dial(OBJECT *tree)
 		switch (mtyp)
 		{
 			case MX_GROUPBOX2:
-				make_userdef(tree, obj, draw_groupbox);
+				make_userdef(uPtr, tree, obj, draw_groupbox);
+				uPtr++;
 				break;
 		}
 
 		/* den Rest nur, wenn keine WHITEBACK-Buttons verfgbar sind */
-/*		if ((gl_magx <= 0x200 && gl_naes < 0x0200) || use_all_userdefs) */
 		if (!mx_buttons || use_all_userdefs)
 		{
 			switch (mtyp)
 			{
 				case MX_UNDERLINE:
-					make_userdef(tree, obj, draw_underline);
+					make_userdef(uPtr, tree, obj, draw_underline);
+					uPtr++;
 					break;
 				case MX_GROUPBOX:
-					make_userdef(tree, obj, draw_groupbox);
+					make_userdef(uPtr, tree, obj, draw_groupbox);
+					uPtr++;
 					break;
 				case MX_RADIO:
 				case MX_SCRADIO:
-					make_userdef(tree, obj, draw_radiobutton);
+					make_userdef(uPtr, tree, obj, draw_radiobutton);
+					uPtr++;
 					break;
 				case MX_CHECK:
 				case MX_SCCHECK:
-					make_userdef(tree, obj, draw_checkbutton);
+					make_userdef(uPtr, tree, obj, draw_checkbutton);
+					uPtr++;
 					break;
 				case MX_SCSTRING:
-					make_userdef(tree, obj, draw_scstring);
+					make_userdef(uPtr, tree, obj, draw_scstring);
+					uPtr++;
 					break;
 			}
 		}

wddelete.c

@@ -54,6 +54,6 @@ void delete_wdial(WDIALOG *wd)
 			p->next = wd->next;
 		}
 
-		Mfree(wd);
+		free(wd);
 	}
 }