--- np2/win9xc/dialog/d_about.cpp 2004/02/13 20:31:55 1.2 +++ np2/win9xc/dialog/d_about.cpp 2005/03/20 08:58:20 1.5 @@ -4,18 +4,35 @@ #include "dialog.h" #include "dialogs.h" #include "pccore.h" +#include "np2info.h" -static const char str_np2title[] = "Neko Project II "; +static const TCHAR str_np2title[] = _T("Neko Project II "); +static const TCHAR np2infostr[] = \ + _T("CPU: %CPU% %CLOCK%\n") \ + _T("MEM: %MEM1%\n") \ + _T("GDC: %GDC%\n") \ + _T(" %GDC2%\n") \ + _T("TEXT: %TEXT%\n") \ + _T("GRPH: %GRPH%\n") \ + _T("SOUND: %EXSND%\n") \ + _T("\n") \ + _T("BIOS: %BIOS%\n") \ + _T("RHYTHM: %RHYTHM%\n") \ + _T("\n") \ + _T("SCREEN: %DISP%"); static void about_init(HWND hWnd) { - char work[128]; + TCHAR work[128]; + TCHAR infostr[1024]; - milstr_ncpy(work, str_np2title, sizeof(work)); - milstr_ncat(work, np2version, sizeof(work)); + milstr_ncpy(work, str_np2title, NELEMENTS(work)); + milstr_ncat(work, np2version, NELEMENTS(work)); SetDlgItemText(hWnd, IDC_NP2VER, work); + np2info(infostr, np2infostr, NELEMENTS(infostr), NULL); + SetDlgItemText(hWnd, IDC_NP2INFO, infostr); SetFocus(GetDlgItem(hWnd, IDOK)); }