--- np2/win9x/trace.cpp 2005/02/15 18:42:20 1.11 +++ np2/win9x/trace.cpp 2007/12/16 14:58:24 1.18 @@ -1,15 +1,14 @@ #include "compiler.h" #include #include "strres.h" +#include "textfile.h" +#include "oemtext.h" #include "dosio.h" #include "ini.h" #ifdef TRACE -// #define FILEBUFSIZE (1 << 20) -// #define FILELASTBUFONLY - #ifdef STRICT #define SUBCLASSPROC WNDPROC #else @@ -24,9 +23,9 @@ #define VIEW_SIZE 12 typedef struct { - UINT8 en; - FILEH fh; - HWND hwnd; + UINT8 en; + TEXTFILEH tf; + HWND hwnd; } TRACEWIN; typedef struct { @@ -36,8 +35,7 @@ typedef struct { int height; } TRACECFG; -extern HINSTANCE hInst; -extern HINSTANCE hPrev; +extern HINSTANCE g_hInstance; enum { IDM_TRACE1 = 3300, @@ -47,32 +45,35 @@ enum { 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 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) { @@ -85,102 +86,57 @@ static void View_ScrollToBottom(HWND hWn static void View_ClrString(void) { - szView[0] = '\0'; - SetWindowText(hView, szView); + viewpos = 0; + viewleng = 0; + viewbuf[0] = '\0'; + SetWindowText(hView, viewbuf); } -static void View_AddString(const char *lpszString) { +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); - } - strcat(szView, lpszString); - 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; + if (vpos >= VIEW_BUFFERSIZE) { + if (vlen) { + CopyMemory(viewbuf, viewbuf + vpos, vlen * sizeof(TCHAR)); + } + vpos = 0; + viewpos = 0; } } +#if defined(OEMCHAR_SAME_TCHAR) + CopyMemory(viewbuf + vpos + vlen, string, slen * sizeof(TCHAR)); #else - file_write(tracewin.fh, buf, size); + 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); } @@ -220,7 +176,7 @@ static LRESULT CALLBACK traceproc(HWND h WS_CHILD | WS_VISIBLE | ES_READONLY | ES_LEFT | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL, 0, 0, rc.right, rc.bottom, - hWnd, (HMENU)IDC_VIEW, hInst, NULL); + hWnd, (HMENU)IDC_VIEW, g_hInstance, NULL); if (!hView) { break; } @@ -228,7 +184,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; } @@ -262,16 +218,17 @@ static LRESULT CALLBACK traceproc(HWND h break; case IDM_TRACEFH: - if (tracewin.fh != FILEH_INVALID) { - trfh_close(); + if (tracewin.tf != NULL) { + textfile_close(tracewin.tf); + tracewin.tf = NULL; } else { - trfh_open("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: @@ -349,42 +306,41 @@ void trace_init(void) { HWND hwnd; - if (!hPrev) { - WNDCLASS wc; - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = traceproc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInst; - wc.hIcon = NULL; - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = (LPCSTR)ClassName; - if (!RegisterClass(&wc)) { - return; - } + ZeroMemory(&tracewin, sizeof(tracewin)); + WNDCLASS wc; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = traceproc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = g_hInstance; + wc.hIcon = NULL; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = ClassName; + if (!RegisterClass(&wc)) { + return; } #if 1 tracewin.en = 4; #else - tracewin.en = 0; + tracewin.en = 1; + tracewin.tf = textfile_create(OEMTEXT("traceout.txt"), 0x800); #endif - tracewin.fh = FILEH_INVALID; 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, WS_OVERLAPPEDWINDOW, tracecfg.posx, tracecfg.posy, tracecfg.width, tracecfg.height, - NULL, NULL, hInst, NULL); + NULL, NULL, g_hInstance, NULL); tracewin.hwnd = hwnd; if (hwnd == NULL) { return; @@ -395,13 +351,14 @@ void trace_init(void) { void trace_term(void) { - if (tracewin.fh != FILEH_INVALID) { - trfh_close(); + 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)); } } @@ -409,20 +366,27 @@ 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.fh != FILEH_INVALID)); + ((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.fh != FILEH_INVALID) { - trfh_add(buf); - trfh_add(crlf); + if (tracewin.tf != NULL) { + textfile_write(tracewin.tf, buf); + textfile_write(tracewin.tf, crlf); } } } @@ -431,20 +395,27 @@ void trace_fmt2(const char *fmt, ...) { BOOL en; va_list ap; - char buf[0x1000]; + OEMCHAR buf[0x1000]; en = (tracewin.en & 2) && - ((tracewin.en & 4) || (tracewin.fh != FILEH_INVALID)); + ((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.fh != FILEH_INVALID) { - trfh_add(buf); - trfh_add(crlf); + if (tracewin.tf != FILEH_INVALID) { + textfile_write(tracewin.tf, buf); + textfile_write(tracewin.tf, crlf); } } } @@ -454,12 +425,19 @@ 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(devstr); + View_AddString(pdevstr); } - if (tracewin.fh != FILEH_INVALID) { - trfh_add(devstr); - trfh_add(crlf); + if (tracewin.tf != NULL) { + textfile_write(tracewin.tf, pdevstr); + textfile_write(tracewin.tf, crlf); } devpos = 0; }