--- np2/win9x/trace.cpp 2003/11/30 11:20:55 1.6 +++ np2/win9x/trace.cpp 2008/02/17 01:29:17 1.19 @@ -1,9 +1,12 @@ #include "compiler.h" #include +#include "resource.h" #include "strres.h" +#include "textfile.h" +#include "oemtext.h" #include "dosio.h" #include "ini.h" - +#include "menu.h" #ifdef TRACE @@ -20,10 +23,11 @@ #define VIEW_TEXT "£Í£Ó ¥´¥·¥Ã¥¯" #define VIEW_SIZE 12 -typedef struct { - BYTE en; - FILEH fh; - HWND hwnd; +typedef struct +{ + UINT8 en; + TEXTFILEH tf; + HWND hwnd; } TRACEWIN; typedef struct { @@ -33,35 +37,33 @@ typedef struct { int height; } TRACECFG; -extern HINSTANCE hInst; -extern HINSTANCE hPrev; +extern HINSTANCE g_hInstance; -enum { - IDM_TRACEEN = 3300, - IDM_TRACEFH -}; - -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 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 HWND s_hView = NULL; +static HFONT s_hfView = NULL; +static HBRUSH s_hBrush = NULL; +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,104 +74,170 @@ 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(s_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); - View_ScrollToBottom(hView); +#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(s_hView, viewbuf + vpos); + View_ScrollToBottom(s_hView); } -static LRESULT CALLBACK traceproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { +// ---- + +static LRESULT onCreate(HWND hWnd) +{ + HMENU hMenu; RECT rc; - HMENU hmenu; - switch (msg) { - case WM_CREATE: - hmenu = GetSystemMenu(hWnd, FALSE); - InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING, - IDM_TRACEEN, traceen); - InsertMenu(hmenu, 1, MF_BYPOSITION | MF_STRING, - IDM_TRACEFH, tracefh); - InsertMenu(hmenu, 2, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); + hMenu = GetSystemMenu(hWnd, FALSE); + menu_addmenures(hMenu, 0, IDR_TRACE, FALSE); - CheckMenuItem(hmenu, IDM_TRACEEN, + CheckMenuItem(hMenu, IDM_TRACE_TRACE, (tracewin.en & 1)?MF_CHECKED:MF_UNCHECKED); + CheckMenuItem(hMenu, IDM_TRACE_VERBOSE, + (tracewin.en & 2)?MF_CHECKED:MF_UNCHECKED); + CheckMenuItem(hMenu, IDM_TRACE_ENABLE, + (tracewin.en & 4)?MF_CHECKED:MF_UNCHECKED); - GetClientRect(hWnd, &rc); - hView = CreateWindowEx(WS_EX_CLIENTEDGE, + GetClientRect(hWnd, &rc); + s_hView = CreateWindowEx(WS_EX_CLIENTEDGE, ClassEdit, NULL, 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); - if (!hView) { - break; - } - SendMessage(hView, EM_SETLIMITTEXT, (WPARAM)VIEW_BUFFERSIZE, 0); + hWnd, (HMENU)IDC_VIEW, g_hInstance, NULL); + SendMessage(s_hView, EM_SETLIMITTEXT, (WPARAM)VIEW_BUFFERSIZE, 0); - hfView = CreateFont(VIEW_SIZE, 0, 0, 0, 0, 0, 0, 0, + s_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); - if (!hfView) { - break; - } - SendMessage(hView, WM_SETFONT, (WPARAM)hfView, + DEFAULT_QUALITY, FIXED_PITCH, viewfont); + if (s_hfView) + { + SendMessage(s_hView, WM_SETFONT, (WPARAM)s_hfView, MAKELPARAM(TRUE, 0)); - hBrush = CreateSolidBrush(VIEW_BGCOLOR); - SetFocus(hView); - return(TRUE); + } - case WM_SYSCOMMAND: - switch(wp) { - case IDM_TRACEEN: - tracewin.en ^= 1; - hmenu = GetSystemMenu(hWnd, FALSE); - CheckMenuItem(hmenu, IDM_TRACEEN, + s_hBrush = CreateSolidBrush(VIEW_BGCOLOR); + SetFocus(s_hView); + + return TRUE; +} + +static LRESULT onSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + HMENU hMenu; + + hMenu = GetSystemMenu(hWnd, FALSE); + switch(wParam) + { + case IDM_TRACE_TRACE: + tracewin.en ^= 1; + CheckMenuItem(hMenu, IDM_TRACE_TRACE, (tracewin.en & 1)?MF_CHECKED:MF_UNCHECKED); - break; + break; + + case IDM_TRACE_VERBOSE: + tracewin.en ^= 2; + CheckMenuItem(hMenu, IDM_TRACE_VERBOSE, + (tracewin.en & 2)?MF_CHECKED:MF_UNCHECKED); + break; - case IDM_TRACEFH: - if (tracewin.fh != FILEH_INVALID) { - file_close(tracewin.fh); - tracewin.fh = FILEH_INVALID; - } - else { - tracewin.fh = file_create("traceout.txt"); - } - hmenu = GetSystemMenu(hWnd, FALSE); - CheckMenuItem(hmenu, IDM_TRACEFH, - (tracewin.fh != FILEH_INVALID)? - MF_CHECKED:MF_UNCHECKED); - break; + case IDM_TRACE_ENABLE: + tracewin.en ^= 4; + CheckMenuItem(hMenu, IDM_TRACE_ENABLE, + (tracewin.en & 4)?MF_CHECKED:MF_UNCHECKED); + break; - default: - return(DefWindowProc(hWnd, msg, wp, lp)); + case IDM_TRACE_FILEOUT: + if (tracewin.tf != NULL) + { + textfile_close(tracewin.tf); + tracewin.tf = NULL; + } + else + { + tracewin.tf = textfile_create(OEMTEXT("traceout.txt"), + 0x800); } + CheckMenuItem(hMenu, IDM_TRACE_FILEOUT, + (tracewin.tf)?MF_CHECKED:MF_UNCHECKED); break; + case IDM_TRACE_CLEAR: + View_ClrString(); + break; + + default: + return DefWindowProc(hWnd, WM_SYSCOMMAND, wParam, lParam); + } + return FALSE; +} + +static LRESULT CALLBACK traceproc(HWND hWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam) +{ + RECT rc; + + switch(uMsg) + { + case WM_CREATE: + return onCreate(hWnd); + + case WM_SYSCOMMAND: + return onSysCommand(hWnd, wParam, lParam); + case WM_MOVE: if (!(GetWindowLong(hWnd, GWL_STYLE) & - (WS_MAXIMIZE | WS_MINIMIZE))) { + (WS_MAXIMIZE | WS_MINIMIZE))) + { GetWindowRect(hWnd, &rc); tracecfg.posx = rc.left; tracecfg.posy = rc.top; @@ -178,34 +246,37 @@ static LRESULT CALLBACK traceproc(HWND h case WM_SIZE: // window resize if (!(GetWindowLong(hWnd, GWL_STYLE) & - (WS_MAXIMIZE | WS_MINIMIZE))) { + (WS_MAXIMIZE | WS_MINIMIZE))) + { GetWindowRect(hWnd, &rc); tracecfg.width = rc.right - rc.left; tracecfg.height = rc.bottom - rc.top; } - MoveWindow(hView, 0, 0, LOWORD(lp), HIWORD(lp), TRUE); - View_ScrollToBottom(hView); + MoveWindow(s_hView, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); + View_ScrollToBottom(s_hView); break; case WM_SETFOCUS: - SetFocus(hView); + SetFocus(s_hView); return(0L); case WM_CTLCOLORSTATIC: case WM_CTLCOLOREDIT: - SetTextColor((HDC)wp, VIEW_FGCOLOR); - SetBkColor((HDC)wp, VIEW_BGCOLOR); - return((LRESULT)hBrush); + SetTextColor((HDC)wParam, VIEW_FGCOLOR); + SetBkColor((HDC)wParam, VIEW_BGCOLOR); + return((LRESULT)s_hBrush); case WM_CLOSE: break; case WM_DESTROY: - if (hBrush) { - DeleteObject(hBrush); + if (s_hBrush) + { + DeleteObject(s_hBrush); } - if (hfView) { - DeleteObject(hfView); + if (s_hfView) + { + DeleteObject(s_hfView); } break; #if 0 @@ -214,16 +285,16 @@ static LRESULT CALLBACK traceproc(HWND h break; case WM_MOVING: - winloc_movingproc((RECT *)lp); + winloc_movingproc((RECT *)lParam); break; case WM_ERASEBKGND: - return(FALSE); + return FALSE; #endif default: - return(DefWindowProc(hWnd, msg, wp, lp)); + return DefWindowProc(hWnd, uMsg, wParam, lParam); } - return(0L); + return FALSE; } @@ -233,38 +304,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; } -// tracewin.en = 1; - tracewin.fh = FILEH_INVALID; +#if 1 + tracewin.en = 4; +#else + tracewin.en = 1; + 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, 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; @@ -275,14 +349,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 +364,88 @@ void trace_fmt(const char *fmt, ...) { BOOL en; va_list ap; - char buf[0x1000]; + OEMCHAR buf[0x1000]; - en = (tracewin.en & 1) || (tracewin.fh != FILEH_INVALID); + 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 & 1) && (hView)) { + if ((tracewin.en & 4) && (s_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 != 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 & 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 & 4) && (s_hView)) { + View_AddString(buf); + } + 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) && (s_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