--- np2/win9x/trace.cpp 2003/11/12 00:55:38 1.3 +++ np2/win9x/trace.cpp 2007/10/28 16:01:35 1.17 @@ -1,6 +1,8 @@ #include "compiler.h" #include #include "strres.h" +#include "textfile.h" +#include "oemtext.h" #include "dosio.h" #include "ini.h" @@ -21,9 +23,9 @@ #define VIEW_SIZE 12 typedef struct { - BYTE en; - FILEH fh; - HWND hwnd; + UINT8 en; + TEXTFILEH tf; + HWND hwnd; } TRACEWIN; typedef struct { @@ -37,31 +39,42 @@ 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 traceen[] = "Enable"; -static const char tracefh[] = "File out"; -static const char crlf[] = "\r\n"; +static const TCHAR ProgTitle[] = _T("console"); +static const TCHAR ClassName[] = _T("TRACE-console"); +static const TCHAR ClassEdit[] = _T("EDIT"); +static const TCHAR viewfont[] = _T(VIEW_TEXT); +static const TCHAR trace1[] = _T("TRACE"); +static const TCHAR trace2[] = _T("VERBOSE"); +static const TCHAR traceen[] = _T("Enable"); +static const TCHAR tracefh[] = _T("File out"); +static const TCHAR tracecl[] = _T("Clear"); +static const OEMCHAR crlf[] = OEMTEXT("\r\n"); static TRACEWIN tracewin; static HWND hView = NULL; static HFONT hfView = NULL; static HBRUSH hBrush = NULL; -static char szView[VIEW_BUFFERSIZE]; +static int viewpos; +static int viewleng; +static TCHAR viewbuf[VIEW_BUFFERSIZE * 2]; static TRACECFG tracecfg; +static int devpos; +static char devstr[256]; -static const char np2trace[] = "np2trace.ini"; -static const char inititle[] = "TRACE"; -static const INITBL initbl[4] = { - {"posx", INITYPE_SINT32, &tracecfg.posx, 0}, - {"posy", INITYPE_SINT32, &tracecfg.posy, 0}, - {"width", INITYPE_SINT32, &tracecfg.width, 0}, - {"height", INITYPE_SINT32, &tracecfg.height, 0}}; +static const OEMCHAR np2trace[] = OEMTEXT("np2trace.ini"); +static const OEMCHAR inititle[] = OEMTEXT("TRACE"); +static const PFTBL initbl[4] = { + PFVAL("posx", PFTYPE_SINT32, &tracecfg.posx), + PFVAL("posy", PFTYPE_SINT32, &tracecfg.posy), + PFVAL("width", PFTYPE_SINT32, &tracecfg.width), + PFVAL("height", PFTYPE_SINT32, &tracecfg.height)}; static void View_ScrollToBottom(HWND hWnd) { @@ -72,32 +85,64 @@ static void View_ScrollToBottom(HWND hWn PostMessage(hWnd, EM_LINESCROLL, 0, MaxPos); } -static void View_AddString(const char *lpszString) { +static void View_ClrString(void) { + + viewpos = 0; + viewleng = 0; + viewbuf[0] = '\0'; + SetWindowText(hView, viewbuf); +} + +static void View_AddString(const OEMCHAR *string) { - int len, vlen; - char *p; + int slen; + int vpos; + int vlen; + TCHAR c; - len = strlen(lpszString); - if ((!len) || ((len + 3) > VIEW_BUFFERSIZE)) { +#if defined(OEMCHAR_SAME_TCHAR) + slen = lstrlen(string); +#else + slen = oemtotchar(NULL, 0, string, (UINT)-1) - 1; +#endif + if ((slen == 0) || ((slen + 3) > VIEW_BUFFERSIZE)) { return; } - vlen = strlen(szView); - if ((vlen + len + 3) > VIEW_BUFFERSIZE) { - p = szView; - while(*p) { + vpos = viewpos; + vlen = viewleng; + if ((vpos + vlen + slen + 3) > (VIEW_BUFFERSIZE * 2)) { + while(vlen > 0) { vlen--; - if ((*p++ == 0x0a) && ((vlen + len + 3) <= VIEW_BUFFERSIZE)) { + c = viewbuf[vpos++]; + if ((c == 0x0a) && ((vlen + slen + 3) <= VIEW_BUFFERSIZE)) { break; } } - strcpy(szView, p); + if (vpos >= VIEW_BUFFERSIZE) { + if (vlen) { + CopyMemory(viewbuf, viewbuf + vpos, vlen * sizeof(TCHAR)); + } + vpos = 0; + viewpos = 0; + } } - strcat(szView, lpszString); - strcat(szView, crlf); - SetWindowText(hView, szView); +#if defined(OEMCHAR_SAME_TCHAR) + CopyMemory(viewbuf + vpos + vlen, string, slen * sizeof(TCHAR)); +#else + oemtotchar(viewbuf + vpos + vlen, slen + 1, string, (UINT)-1); +#endif + vlen += slen; + viewbuf[vpos + vlen + 0] = '\r'; + viewbuf[vpos + vlen + 1] = '\n'; + viewbuf[vpos + vlen + 2] = '\0'; + viewleng = vlen + 2; + SetWindowText(hView, viewbuf + vpos); View_ScrollToBottom(hView); } + +// ---- + static LRESULT CALLBACK traceproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { RECT rc; @@ -107,13 +152,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, @@ -129,7 +185,7 @@ static LRESULT CALLBACK traceproc(HWND h hfView = CreateFont(VIEW_SIZE, 0, 0, 0, 0, 0, 0, 0, SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, FIXED_PITCH, VIEW_TEXT); + DEFAULT_QUALITY, FIXED_PITCH, viewfont); if (!hfView) { break; } @@ -141,25 +197,43 @@ 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; + if (tracewin.tf != NULL) { + textfile_close(tracewin.tf); + tracewin.tf = NULL; } else { - tracewin.fh = file_create("traceout.txt"); + tracewin.tf = textfile_create(OEMTEXT("traceout.txt"), + 0x800); } hmenu = GetSystemMenu(hWnd, FALSE); CheckMenuItem(hmenu, IDM_TRACEFH, - (tracewin.fh != FILEH_INVALID)? - MF_CHECKED:MF_UNCHECKED); + (tracewin.tf)?MF_CHECKED:MF_UNCHECKED); + break; + + case IDM_TRACECL: + View_ClrString(); break; default: @@ -233,6 +307,7 @@ void trace_init(void) { HWND hwnd; + ZeroMemory(&tracewin, sizeof(tracewin)); if (!hPrev) { WNDCLASS wc; wc.style = CS_HREDRAW | CS_VREDRAW; @@ -244,20 +319,24 @@ void trace_init(void) { wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; - wc.lpszClassName = (LPCSTR)ClassName; + wc.lpszClassName = ClassName; if (!RegisterClass(&wc)) { return; } } +#if 1 + tracewin.en = 4; +#else tracewin.en = 1; - tracewin.fh = FILEH_INVALID; + tracewin.tf = textfile_create(OEMTEXT("traceout.txt"), 0x800); +#endif tracecfg.posx = CW_USEDEFAULT; tracecfg.posy = CW_USEDEFAULT; tracecfg.width = CW_USEDEFAULT; tracecfg.height = CW_USEDEFAULT; - ini_read(file_getcd(np2trace), inititle, initbl, 4); + ini_read(file_getcd(np2trace), inititle, initbl, NELEMENTS(initbl)); hwnd = CreateWindowEx(WS_EX_CONTROLPARENT, ClassName, ProgTitle, @@ -275,14 +354,14 @@ void trace_init(void) { void trace_term(void) { - if (tracewin.fh != FILEH_INVALID) { - file_close(tracewin.fh); - tracewin.fh = FILEH_INVALID; + if (tracewin.tf != NULL) { + textfile_close(tracewin.tf); + tracewin.tf = NULL; } if (tracewin.hwnd) { DestroyWindow(tracewin.hwnd); tracewin.hwnd = NULL; - ini_write(file_getcd(np2trace), inititle, initbl, 4); + ini_write(file_getcd(np2trace), inititle, initbl, NELEMENTS(initbl)); } } @@ -290,22 +369,87 @@ void trace_fmt(const char *fmt, ...) { BOOL en; va_list ap; - char buf[0x1000]; + OEMCHAR buf[0x1000]; + + en = (tracewin.en & 1) && + ((tracewin.en & 4) || (tracewin.tf != NULL)); + if (en) { + va_start(ap, fmt); +#if defined(OSLANG_UCS2) + OEMCHAR cnvfmt[0x800]; + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, fmt, -1, + cnvfmt, NELEMENTS(cnvfmt)); + vswprintf(buf, cnvfmt, ap); +#else + vsprintf(buf, fmt, ap); +#endif + va_end(ap); + if ((tracewin.en & 4) && (hView)) { + View_AddString(buf); + } + if (tracewin.tf != NULL) { + textfile_write(tracewin.tf, buf); + textfile_write(tracewin.tf, crlf); + } + } +} + +void trace_fmt2(const char *fmt, ...) { + + BOOL en; + va_list ap; + OEMCHAR buf[0x1000]; - en = (tracewin.en & 1) || (tracewin.fh != FILEH_INVALID); + en = (tracewin.en & 2) && + ((tracewin.en & 4) || (tracewin.tf != NULL)); if (en) { va_start(ap, fmt); +#if defined(OSLANG_UCS2) + OEMCHAR cnvfmt[0x800]; + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, fmt, -1, + cnvfmt, NELEMENTS(cnvfmt)); + vswprintf(buf, cnvfmt, ap); +#else vsprintf(buf, fmt, ap); +#endif 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, crlf, strlen(crlf)); + if (tracewin.tf != FILEH_INVALID) { + textfile_write(tracewin.tf, buf); + textfile_write(tracewin.tf, crlf); } } } +void trace_char(char c) { + + if ((c == 0x0a) || (c == 0x0d)) { + if (devpos) { + devstr[devpos] = '\0'; +#if defined(OSLANG_UCS2) + TCHAR pdevstr[0x800]; + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, devstr, -1, + pdevstr, NELEMENTS(pdevstr)); +#else + const OEMCHAR *pdevstr = devstr; +#endif + if ((tracewin.en & 4) && (hView)) { + View_AddString(pdevstr); + } + if (tracewin.tf != NULL) { + textfile_write(tracewin.tf, pdevstr); + textfile_write(tracewin.tf, crlf); + } + devpos = 0; + } + } + else { + if (devpos < (sizeof(devstr) - 1)) { + devstr[devpos++] = c; + } + } +} #endif