--- np2/win9x/dialog/d_config.cpp 2003/10/31 03:40:10 1.5 +++ np2/win9x/dialog/d_config.cpp 2007/11/11 07:11:28 1.15 @@ -2,6 +2,7 @@ #include "strres.h" #include "resource.h" #include "np2.h" +#include "oemtext.h" #include "dosio.h" #include "sysmng.h" #include "dialog.h" @@ -9,104 +10,121 @@ #include "pccore.h" -static const char str_2halfmhz[] = "2.4576MHz"; -static const char str_2mhz[] = "1.9968MHz"; -static const char *basecstr[2] = {str_2halfmhz, str_2mhz}; +static const CBPARAM cpBase[] = +{ + {MAKEINTRESOURCE(IDS_2_0MHZ), PCBASECLOCK20}, + {MAKEINTRESOURCE(IDS_2_5MHZ), PCBASECLOCK25}, +}; static const UINT32 mulval[10] = {1, 2, 4, 5, 6, 8, 10, 12, 16, 20}; -static const char str_clockfmt[] = "%2u.%.4u"; +static const TCHAR str_clockfmt[] = _T("%2u.%.4u"); -static void setclock(HWND hWnd, UINT multiple) { +static void setclock(HWND hWnd, UINT uMultiple) +{ + UINT uClock; + TCHAR szWork[32]; - UINT32 clock; - char work[32]; + uClock = dlgs_getcbcur(hWnd, IDC_BASECLOCK, PCBASECLOCK20); - GetDlgItemText(hWnd, IDC_BASECLOCK, work, sizeof(work)); - if (work[0] == '1') { - clock = PCBASECLOCK20 / 100; + if (uMultiple == 0) + { + GetDlgItemText(hWnd, IDC_MULTIPLE, szWork, NELEMENTS(szWork)); + uMultiple = (UINT)miltchar_solveINT(szWork); } - else { - clock = PCBASECLOCK25 / 100; - } - if (multiple == 0) { - GetDlgItemText(hWnd, IDC_MULTIPLE, work, sizeof(work)); - multiple = (UINT)milstr_solveINT(work); - } - if (multiple < 1) { - multiple = 1; - } - else if (multiple > 32) { - multiple = 32; - } - clock *= multiple; - wsprintf(work, str_clockfmt, clock / 10000, clock % 10000); - SetDlgItemText(hWnd, IDC_CLOCKMSG, work); + uMultiple = max(uMultiple, 1); + uMultiple = min(uMultiple, 32); + + uClock = (uClock / 100) * uMultiple; + wsprintf(szWork, str_clockfmt, uClock / 10000, uClock % 10000); + SetDlgItemText(hWnd, IDC_CLOCKMSG, szWork); } static void cfgcreate(HWND hWnd) { - char work[32]; + TCHAR work[32]; UINT val; - SETLISTSTR(hWnd, IDC_BASECLOCK, basecstr); - if (np2cfg.baseclock >= AVE(PCBASECLOCK25, PCBASECLOCK20)) { - val = 0; + dlgs_setcbitem(hWnd, IDC_BASECLOCK, cpBase, NELEMENTS(cpBase)); + if (np2cfg.baseclock < AVE(PCBASECLOCK25, PCBASECLOCK20)) + { + val = PCBASECLOCK20; } - else { - val = 1; + else + { + val = PCBASECLOCK25; } - SendDlgItemMessage(hWnd, IDC_BASECLOCK, CB_SETCURSEL, val, 0); + dlgs_setcbcur(hWnd, IDC_BASECLOCK, val); + SETLISTUINT32(hWnd, IDC_MULTIPLE, mulval); - wsprintf(work, str_u, np2cfg.multiple); + wsprintf(work, tchar_u, np2cfg.multiple); SetDlgItemText(hWnd, IDC_MULTIPLE, work); - if (np2cfg.samplingrate < AVE(11025, 22050)) { + if (!milstr_cmp(np2cfg.model, str_VM)) + { + val = IDC_MODELVM; + } + else if (!milstr_cmp(np2cfg.model, str_EPSON)) + { + val = IDC_MODELEPSON; + } + else + { + val = IDC_MODELVX; + } + SetDlgItemCheck(hWnd, val, TRUE); + + if (np2cfg.samplingrate < AVE(11025, 22050)) + { val = IDC_RATE11; } - else if (np2cfg.samplingrate < AVE(22050, 44100)) { + else if (np2cfg.samplingrate < AVE(22050, 44100)) + { val = IDC_RATE22; } - else { + else + { val = IDC_RATE44; } SetDlgItemCheck(hWnd, val, TRUE); - wsprintf(work, str_u, np2cfg.delayms); + wsprintf(work, tchar_u, np2cfg.delayms); SetDlgItemText(hWnd, IDC_SOUNDBUF, work); - if (mmxflag & MMXFLAG_NOTSUPPORT) { + SetDlgItemCheck(hWnd, IDC_ALLOWRESIZE, np2oscfg.thickframe); +#if !defined(_WIN64) + if (mmxflag & MMXFLAG_NOTSUPPORT) + { EnableWindow(GetDlgItem(hWnd, IDC_DISABLEMMX), FALSE); SetDlgItemCheck(hWnd, IDC_DISABLEMMX, TRUE); } - else { + else + { SetDlgItemCheck(hWnd, IDC_DISABLEMMX, np2oscfg.disablemmx); } +#endif SetDlgItemCheck(hWnd, IDC_COMFIRM, np2oscfg.comfirm); SetDlgItemCheck(hWnd, IDC_RESUME, np2oscfg.resume); setclock(hWnd, 0); SetFocus(GetDlgItem(hWnd, IDC_BASECLOCK)); } -static void cfgupdate(HWND hWnd) { - - UINT update; - char work[32]; - UINT val; +static void cfgupdate(HWND hWnd) +{ + UINT update; + TCHAR work[32]; + UINT val; +const OEMCHAR *str; update = 0; - GetDlgItemText(hWnd, IDC_BASECLOCK, work, sizeof(work)); - if (work[0] == '1') { - val = PCBASECLOCK20; - } - else { - val = PCBASECLOCK25; - } - if (np2cfg.baseclock != val) { + + val = dlgs_getcbcur(hWnd, IDC_BASECLOCK, PCBASECLOCK20); + if (np2cfg.baseclock != val) + { np2cfg.baseclock = val; update |= SYS_UPDATECFG | SYS_UPDATECLOCK; } GetDlgItemText(hWnd, IDC_MULTIPLE, work, sizeof(work)); - val = (UINT)milstr_solveINT(work); + val = (UINT)miltchar_solveINT(work); if (val < 1) { val = 1; } @@ -118,6 +136,20 @@ static void cfgupdate(HWND hWnd) { update |= SYS_UPDATECFG | SYS_UPDATECLOCK; } + if (GetDlgItemCheck(hWnd, IDC_MODELVM)) { + str = str_VM; + } + else if (GetDlgItemCheck(hWnd, IDC_MODELEPSON)) { + str = str_EPSON; + } + else { + str = str_VX; + } + if (milstr_cmp(np2cfg.model, str)) { + milstr_ncpy(np2cfg.model, str, NELEMENTS(np2cfg.model)); + update |= SYS_UPDATECFG; + } + if (GetDlgItemCheck(hWnd, IDC_RATE11)) { val = 11025; } @@ -133,10 +165,10 @@ static void cfgupdate(HWND hWnd) { soundrenewal = 1; } - GetDlgItemText(hWnd, IDC_SOUNDBUF, work, sizeof(work)); - val = (UINT)milstr_solveINT(work); - if (val < 100) { - val = 100; + GetDlgItemText(hWnd, IDC_SOUNDBUF, work, NELEMENTS(work)); + val = (UINT)miltchar_solveINT(work); + if (val < 40) { + val = 40; } else if (val > 1000) { val = 1000; @@ -147,25 +179,37 @@ static void cfgupdate(HWND hWnd) { soundrenewal = 1; } - if (!(mmxflag & MMXFLAG_NOTSUPPORT)) { + val = GetDlgItemCheck(hWnd, IDC_ALLOWRESIZE); + if (np2oscfg.thickframe != (UINT8)val) { + np2oscfg.thickframe = (UINT8)val; + update |= SYS_UPDATEOSCFG; + } + +#if !defined(_WIN64) + if (!(mmxflag & MMXFLAG_NOTSUPPORT)) + { val = GetDlgItemCheck(hWnd, IDC_DISABLEMMX); - if (np2oscfg.disablemmx != (BYTE)val) { - np2oscfg.disablemmx = (BYTE)val; + if (np2oscfg.disablemmx != (UINT8)val) + { + np2oscfg.disablemmx = (UINT8)val; mmxflag &= ~MMXFLAG_DISABLE; mmxflag |= (val)?MMXFLAG_DISABLE:0; update |= SYS_UPDATEOSCFG; } } +#endif val = GetDlgItemCheck(hWnd, IDC_COMFIRM); - if (np2oscfg.comfirm != (BYTE)val) { - np2oscfg.comfirm = (BYTE)val; + if (np2oscfg.comfirm != (UINT8)val) + { + np2oscfg.comfirm = (UINT8)val; update |= SYS_UPDATEOSCFG; } val = GetDlgItemCheck(hWnd, IDC_RESUME); - if (np2oscfg.resume != (BYTE)val) { - np2oscfg.resume = (BYTE)val; + if (np2oscfg.resume != (UINT8)val) + { + np2oscfg.resume = (UINT8)val; update |= SYS_UPDATEOSCFG; } sysmng_update(update); @@ -179,7 +223,7 @@ LRESULT CALLBACK CfgDialogProc(HWND hWnd return(FALSE); case WM_COMMAND: - switch (LOWORD(wp)) { + switch(LOWORD(wp)) { case IDOK: cfgupdate(hWnd); EndDialog(hWnd, IDOK); @@ -198,7 +242,7 @@ LRESULT CALLBACK CfgDialogProc(HWND hWnd UINT val; val = (UINT)SendDlgItemMessage(hWnd, IDC_MULTIPLE, CB_GETCURSEL, 0, 0); - if (val < sizeof(mulval)/sizeof(UINT32)) { + if (val < NELEMENTS(mulval)) { setclock(hWnd, mulval[val]); } }