--- np2/win9xc/trace.cpp	2003/11/13 15:33:06	1.2
+++ np2/win9xc/trace.cpp	2004/03/07 01:23:14	1.9
@@ -38,7 +38,8 @@ extern	HINSTANCE	hPrev;
 
 enum {
 	IDM_TRACEEN		= 3300,
-	IDM_TRACEFH
+	IDM_TRACEFH,
+	IDM_TRACECL
 };
 
 static const char	ProgTitle[] = "console";
@@ -46,6 +47,7 @@ static const char	ClassName[] = "TRACE-c
 static const char	ClassEdit[] = "EDIT";
 static const char	traceen[] = "Enable";
 static const char	tracefh[] = "File out";
+static const char	tracecl[] = "Clear";
 static const char	crlf[] = "\r\n";
 
 static	TRACEWIN	tracewin;
@@ -72,6 +74,12 @@ static void View_ScrollToBottom(HWND hWn
 	PostMessage(hWnd, EM_LINESCROLL, 0, MaxPos);
 }
 
+static void View_ClrString(void) {
+
+	szView[0] = '\0';
+	SetWindowText(hView, szView);
+}
+
 static void View_AddString(const char *lpszString) {
 
 	int		len, vlen;
@@ -110,7 +118,9 @@ static LRESULT CALLBACK traceproc(HWND h
 														IDM_TRACEEN, traceen);
 			InsertMenu(hmenu, 1, MF_BYPOSITION | MF_STRING,
 														IDM_TRACEFH, tracefh);
-			InsertMenu(hmenu, 2, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+			InsertMenu(hmenu, 2, MF_BYPOSITION | MF_STRING,
+														IDM_TRACECL, tracecl);
+			InsertMenu(hmenu, 3, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
 
 			CheckMenuItem(hmenu, IDM_TRACEEN,
 								(tracewin.en & 1)?MF_CHECKED:MF_UNCHECKED);
@@ -162,6 +172,10 @@ static LRESULT CALLBACK traceproc(HWND h
 													MF_CHECKED:MF_UNCHECKED);
 					break;
 
+				case IDM_TRACECL:
+					View_ClrString();
+					break;
+
 				default:
 					return(DefWindowProc(hWnd, msg, wp, lp));
 			}
@@ -250,8 +264,13 @@ void trace_init(void) {
 		}
 	}
 
-	tracewin.en = 1;
+#if 1
+	tracewin.en = 0;
 	tracewin.fh = FILEH_INVALID;
+#else
+	tracewin.en = 0;
+	tracewin.fh = file_create_c("traces.txt");
+#endif
 
 	tracecfg.posx = CW_USEDEFAULT;
 	tracecfg.posy = CW_USEDEFAULT;
@@ -292,6 +311,24 @@ void trace_fmt(const char *fmt, ...) {
 	va_list	ap;
 	char	buf[0x1000];
 
+	va_start(ap, fmt);
+	vsprintf(buf, fmt, ap);
+	va_end(ap);
+	if (hView) {
+		View_AddString(buf);
+	}
+	if (tracewin.fh != FILEH_INVALID) {
+		file_write(tracewin.fh, buf, strlen(buf));
+		file_write(tracewin.fh, crlf, strlen(crlf));
+	}
+}
+
+void trace_fmt2(const char *fmt, ...) {
+
+	BOOL	en;
+	va_list	ap;
+	char	buf[0x1000];
+
 	en = (tracewin.en & 1) || (tracewin.fh != FILEH_INVALID);
 	if (en) {
 		va_start(ap, fmt);
@@ -307,5 +344,16 @@ void trace_fmt(const char *fmt, ...) {
 	}
 }
 
+void trace_fileout(const char *fname) {
+
+	if (tracewin.fh != FILEH_INVALID) {
+		file_close(tracewin.fh);
+		tracewin.fh = FILEH_INVALID;
+	}
+	if (fname) {
+		tracewin.fh = file_create_c(fname);
+	}
+}
+
 #endif