--- np2/win9xc/trace.cpp	2003/11/14 07:37:29	1.3
+++ np2/win9xc/trace.cpp	2005/02/07 14:46:15	1.15
@@ -7,6 +7,9 @@
 
 #ifdef TRACE
 
+// #define FILEBUFSIZE			(1 << 20)
+// #define FILELASTBUFONLY
+
 #ifdef STRICT
 #define	SUBCLASSPROC	WNDPROC
 #else
@@ -21,7 +24,7 @@
 #define	VIEW_SIZE		12
 
 typedef struct {
-	BYTE	en;
+	UINT8	en;
 	FILEH	fh;
 	HWND	hwnd;
 } TRACEWIN;
@@ -37,15 +40,22 @@ extern	HINSTANCE	hInst;
 extern	HINSTANCE	hPrev;
 
 enum {
-	IDM_TRACEEN		= 3300,
-	IDM_TRACEFH
+	IDM_TRACE1		= 3300,
+	IDM_TRACE2,
+	IDM_TRACEEN,
+	IDM_TRACEFH,
+	IDM_TRACECL
 };
 
 static const char	ProgTitle[] = "console";
 static const char	ClassName[] = "TRACE-console";
 static const char	ClassEdit[] = "EDIT";
+static const char	trace1[] = "TRACE";
+static const char	trace2[] = "VERBOSE";
 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;
 static	HWND		hView = NULL;
@@ -71,6 +81,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;
@@ -92,11 +108,82 @@ static void View_AddString(const char *l
 		strcpy(szView, p);
 	}
 	strcat(szView, lpszString);
-	strcat(szView, str_crlf);
+	strcat(szView, crlf);
 	SetWindowText(hView, szView);
 	View_ScrollToBottom(hView);
 }
 
+
+// ----
+
+#if defined(FILEBUFSIZE)
+static	char	filebuf[FILEBUFSIZE];
+static	UINT32	filebufpos;
+#endif
+
+static void trfh_close(void) {
+
+	FILEH	fh;
+
+	fh = tracewin.fh;
+	tracewin.fh = FILEH_INVALID;
+	if (fh != FILEH_INVALID) {
+#if defined(FILEBUFSIZE)
+		UINT 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);
+		}
+#endif
+		file_close(fh);
+	}
+}
+
+static void trfh_open(const char *fname) {
+
+	trfh_close();
+	tracewin.fh = file_create(fname);
+#if defined(FILEBUFSIZE)
+	filebufpos = 0;
+#endif
+}
+
+static void trfh_add(const char *buf) {
+
+	UINT	size;
+
+	size = strlen(buf);
+#if defined(FILEBUFSIZE)
+	while(size) {
+		UINT pos = filebufpos & (FILEBUFSIZE - 1);
+		UINT rem = FILEBUFSIZE - pos;
+		if (size >= rem) {
+			CopyMemory(filebuf + pos, buf, rem);
+			filebufpos += rem;
+			buf += rem;
+			size -= rem;
+#if !defined(FILELASTBUFONLY)
+			file_write(tracewin.fh, filebuf, FILEBUFSIZE);
+#endif
+		}
+		else {
+			CopyMemory(filebuf + pos, buf, size);
+			filebufpos += size;
+			break;
+		}
+	}
+#else
+	file_write(tracewin.fh, buf, size);
+#endif
+}
+
+
+// ----
+
 static LRESULT CALLBACK traceproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
 
 	RECT	rc;
@@ -106,13 +193,24 @@ static LRESULT CALLBACK traceproc(HWND h
 		case WM_CREATE:
 			hmenu = GetSystemMenu(hWnd, FALSE);
 			InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING,
-														IDM_TRACEEN, traceen);
+														IDM_TRACE1, trace1);
 			InsertMenu(hmenu, 1, MF_BYPOSITION | MF_STRING,
-														IDM_TRACEFH, tracefh);
+														IDM_TRACE2, trace2);
 			InsertMenu(hmenu, 2, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+			InsertMenu(hmenu, 3, MF_BYPOSITION | MF_STRING,
+														IDM_TRACEEN, traceen);
+			InsertMenu(hmenu, 4, MF_BYPOSITION | MF_STRING,
+														IDM_TRACEFH, tracefh);
+			InsertMenu(hmenu, 5, MF_BYPOSITION | MF_STRING,
+														IDM_TRACECL, tracecl);
+			InsertMenu(hmenu, 6, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
 
-			CheckMenuItem(hmenu, IDM_TRACEEN,
+			CheckMenuItem(hmenu, IDM_TRACE1,
 								(tracewin.en & 1)?MF_CHECKED:MF_UNCHECKED);
+			CheckMenuItem(hmenu, IDM_TRACE2,
+								(tracewin.en & 2)?MF_CHECKED:MF_UNCHECKED);
+			CheckMenuItem(hmenu, IDM_TRACEEN,
+								(tracewin.en & 4)?MF_CHECKED:MF_UNCHECKED);
 
 			GetClientRect(hWnd, &rc);
 			hView = CreateWindowEx(WS_EX_CLIENTEDGE,
@@ -140,20 +238,33 @@ static LRESULT CALLBACK traceproc(HWND h
 
 		case WM_SYSCOMMAND:
 			switch(wp) {
-				case IDM_TRACEEN:
+				case IDM_TRACE1:
 					tracewin.en ^= 1;
 					hmenu = GetSystemMenu(hWnd, FALSE);
-					CheckMenuItem(hmenu, IDM_TRACEEN,
+					CheckMenuItem(hmenu, IDM_TRACE1,
 								(tracewin.en & 1)?MF_CHECKED:MF_UNCHECKED);
 					break;
 
+				case IDM_TRACE2:
+					tracewin.en ^= 2;
+					hmenu = GetSystemMenu(hWnd, FALSE);
+					CheckMenuItem(hmenu, IDM_TRACE2,
+								(tracewin.en & 2)?MF_CHECKED:MF_UNCHECKED);
+					break;
+
+				case IDM_TRACEEN:
+					tracewin.en ^= 4;
+					hmenu = GetSystemMenu(hWnd, FALSE);
+					CheckMenuItem(hmenu, IDM_TRACEEN,
+								(tracewin.en & 4)?MF_CHECKED:MF_UNCHECKED);
+					break;
+
 				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,
@@ -161,6 +272,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));
 			}
@@ -249,8 +364,14 @@ void trace_init(void) {
 		}
 	}
 
-	tracewin.en = 1;
+#if 1
+	tracewin.en = 0;
 	tracewin.fh = FILEH_INVALID;
+#else
+	tracewin.en = 0;
+	tracewin.fh = FILEH_INVALID;
+	trfh_open("traces.txt");
+#endif
 
 	tracecfg.posx = CW_USEDEFAULT;
 	tracecfg.posy = CW_USEDEFAULT;
@@ -275,8 +396,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);
@@ -291,17 +411,40 @@ void trace_fmt(const char *fmt, ...) {
 	va_list	ap;
 	char	buf[0x1000];
 
-	en = (tracewin.en & 1) || (tracewin.fh != FILEH_INVALID);
+	en = (tracewin.en & 1) &&
+		((tracewin.en & 4) || (tracewin.fh != FILEH_INVALID));
+	if (en) {
+		va_start(ap, fmt);
+		vsprintf(buf, fmt, ap);
+		va_end(ap);
+		if ((tracewin.en & 4) && (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 & 2) &&
+		((tracewin.en & 4) || (tracewin.fh != FILEH_INVALID));
 	if (en) {
 		va_start(ap, fmt);
 		vsprintf(buf, fmt, ap);
 		va_end(ap);
-		if ((tracewin.en & 1) && (hView)) {
+		if ((tracewin.en & 4) && (hView)) {
 			View_AddString(buf);
 		}
 		if (tracewin.fh != FILEH_INVALID) {
-			file_write(tracewin.fh, buf, strlen(buf));
-			file_write(tracewin.fh, str_crlf, strlen(str_crlf));
+			trfh_add(buf);
+			trfh_add(crlf);
 		}
 	}
 }