--- np2/win9xc/trace.cpp	2003/11/13 15:33:06	1.2
+++ np2/win9xc/trace.cpp	2004/03/09 16:31:18	1.10
@@ -7,6 +7,9 @@
 
 #ifdef TRACE
 
+#define	FILEBUFSIZE			(1 << 20)
+#define FILELASTBUFONLY
+
 #ifdef STRICT
 #define	SUBCLASSPROC	WNDPROC
 #else
@@ -38,7 +41,8 @@ extern	HINSTANCE	hPrev;
 
 enum {
 	IDM_TRACEEN		= 3300,
-	IDM_TRACEFH
+	IDM_TRACEFH,
+	IDM_TRACECL
 };
 
 static const char	ProgTitle[] = "console";
@@ -46,6 +50,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 +77,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;
@@ -98,6 +109,70 @@ static void View_AddString(const char *l
 	View_ScrollToBottom(hView);
 }
 
+
+// ----
+
+static	char	filebuf[FILEBUFSIZE];
+static	UINT32	filebufpos;
+
+static void trfh_close(void) {
+
+	FILEH	fh;
+	UINT	size;
+
+	fh = tracewin.fh;
+	tracewin.fh = FILEH_INVALID;
+	if (fh != FILEH_INVALID) {
+		size = filebufpos & (FILEBUFSIZE - 1);
+#if defined(FILELASTBUFONLY)
+		if (filebufpos >= FILEBUFSIZE) {
+			file_write(fh, filebuf + size, FILEBUFSIZE - size);
+		}
+#endif
+		if (size) {
+			file_write(fh, filebuf, size);
+		}
+		file_close(fh);
+	}
+}
+
+static void trfh_open(const char *fname) {
+
+	trfh_close();
+	tracewin.fh = file_create(fname);
+	filebufpos = 0;
+}
+
+static void trfh_add(const char *buf) {
+
+	UINT	size;
+	UINT	pos;
+	UINT	rem;
+
+	size = strlen(buf);
+	while(size) {
+		pos = filebufpos & (FILEBUFSIZE - 1);
+		rem = FILEBUFSIZE - pos;
+		if (size >= rem) {
+			CopyMemory(filebuf + pos, buf, rem);
+			filebufpos += rem;
+			buf += rem;
+			size -= rem;
+#if !defined(FILELASTBUFONLY)
+			file_write(tracewin.fh, buf, strlen(buf));
+#endif
+		}
+		else {
+			CopyMemory(filebuf + pos, buf, size);
+			filebufpos += size;
+			break;
+		}
+	}
+}
+
+
+// ----
+
 static LRESULT CALLBACK traceproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
 
 	RECT	rc;
@@ -110,7 +185,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);
@@ -150,11 +227,10 @@ static LRESULT CALLBACK traceproc(HWND h
 
 				case IDM_TRACEFH:
 					if (tracewin.fh != FILEH_INVALID) {
-						file_close(tracewin.fh);
-						tracewin.fh = FILEH_INVALID;
+						trfh_close();
 					}
 					else {
-						tracewin.fh = file_create("traceout.txt");
+						trfh_open("traceout.txt");
 					}
 					hmenu = GetSystemMenu(hWnd, FALSE);
 					CheckMenuItem(hmenu, IDM_TRACEFH,
@@ -162,6 +238,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 +330,13 @@ void trace_init(void) {
 		}
 	}
 
-	tracewin.en = 1;
+#if 1
+	tracewin.en = 0;
 	tracewin.fh = FILEH_INVALID;
+#else
+	tracewin.en = 0;
+	tracewin.fh = trfh_open("traces.txt");
+#endif
 
 	tracecfg.posx = CW_USEDEFAULT;
 	tracecfg.posy = CW_USEDEFAULT;
@@ -276,8 +361,7 @@ void trace_init(void) {
 void trace_term(void) {
 
 	if (tracewin.fh != FILEH_INVALID) {
-		file_close(tracewin.fh);
-		tracewin.fh = FILEH_INVALID;
+		trfh_close();
 	}
 	if (tracewin.hwnd) {
 		DestroyWindow(tracewin.hwnd);
@@ -292,6 +376,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) {
+		trfh_add(buf);
+		trfh_add(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);
@@ -301,11 +403,24 @@ void trace_fmt(const char *fmt, ...) {
 			View_AddString(buf);
 		}
 		if (tracewin.fh != FILEH_INVALID) {
-			file_write(tracewin.fh, buf, strlen(buf));
-			file_write(tracewin.fh, crlf, strlen(crlf));
+			trfh_add(buf);
+			trfh_add(crlf);
 		}
 	}
 }
 
+#if 0
+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
+
 #endif