--- np2/win9x/dialog/d_screen.cpp 2003/10/16 17:59:00 1.1 +++ np2/win9x/dialog/d_screen.cpp 2006/12/24 00:52:30 1.12 @@ -1,27 +1,29 @@ #include "compiler.h" #include #include -#include "resource.h" #include "strres.h" +#include "resource.h" #include "np2.h" +#include "oemtext.h" #include "scrnmng.h" #include "sysmng.h" +#include "np2class.h" +#include "dialog.h" +#include "dialogs.h" #include "pccore.h" #include "iocore.h" #include "scrndraw.h" #include "palettes.h" -#include "dialog.h" -#include "dialogs.h" -static const char str_scropt[] = "Screen option"; +static const TCHAR str_scropt[] = _T("Screen option"); static LRESULT CALLBACK Scropt1DlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { - char work[32]; - WORD ret; - BYTE b; + TCHAR work[32]; + UINT16 ret; + UINT8 b; int renewal; switch(msg) { @@ -35,12 +37,12 @@ static LRESULT CALLBACK Scropt1DlgProc(H MAKELONG(0, 255)); SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, TBM_SETPOS, TRUE, np2cfg.skiplight); - wsprintf(work, str_d, np2cfg.skiplight); + wsprintf(work, tchar_u, np2cfg.skiplight); SetDlgItemText(hWnd, IDC_LIGHTSTR, work); return(TRUE); case WM_COMMAND: - switch (LOWORD(wp)) { + switch(LOWORD(wp)) { case IDC_LCD: EnableWindow(GetDlgItem(hWnd, IDC_LCDX), GetDlgItemCheck(hWnd, IDC_LCD)); @@ -51,24 +53,25 @@ static LRESULT CALLBACK Scropt1DlgProc(H case WM_HSCROLL: switch(GetDlgCtrlID((HWND)lp)) { case IDC_SKIPLIGHT: - ret = (WORD)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, + ret = (UINT16)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, TBM_GETPOS, 0, 0); - wsprintf(work, str_d, ret); + wsprintf(work, tchar_u, ret); SetDlgItemText(hWnd, IDC_LIGHTSTR, work); break; } break; case WM_NOTIFY: - if ((((NMHDR *)lp)->code) == PSN_APPLY) { + if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) { renewal = 0; - b = GetDlgItemCheck(hWnd, IDC_SKIPLINE); + b = (UINT8)GetDlgItemCheck(hWnd, IDC_SKIPLINE); if (np2cfg.skipline != b) { np2cfg.skipline = b; renewal = 1; } - if ((ret = (WORD)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, - TBM_GETPOS, 0, 0)) > 255) { + ret = (UINT16)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, + TBM_GETPOS, 0, 0); + if (ret > 255) { ret = 255; } if (np2cfg.skiplight != ret) { @@ -78,16 +81,16 @@ static LRESULT CALLBACK Scropt1DlgProc(H if (renewal) { pal_makeskiptable(); } - b = GetDlgItemCheck(hWnd, IDC_LCD) | - (GetDlgItemCheck(hWnd, IDC_LCDX) << 1); + b = (GetDlgItemCheck(hWnd, IDC_LCD)?0x01:0x00) | + (GetDlgItemCheck(hWnd, IDC_LCDX)?0x02:0x00); if (np2cfg.LCD_MODE != b) { np2cfg.LCD_MODE = b; pal_makelcdpal(); renewal = 1; } if (renewal) { - sysmng_update(SYS_UPDATECFG); scrndraw_redraw(); + sysmng_update(SYS_UPDATECFG); } return(TRUE); } @@ -101,7 +104,7 @@ static const int gdcchip[4] = {IDC_GRCGN static LRESULT CALLBACK Scropt2DlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { - BYTE b; + UINT8 b; UINT update; switch(msg) { @@ -114,12 +117,20 @@ static LRESULT CALLBACK Scropt2DlgProc(H } SetDlgItemCheck(hWnd, gdcchip[np2cfg.grcg & 3], TRUE); SetDlgItemCheck(hWnd, IDC_PC980124, np2cfg.color16); +#if defined(SUPPORT_PC9821) + EnableWindow(GetDlgItem(hWnd, IDC_GCBOX), FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_GRCGNON), FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_GRCG), FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_GRCG2), FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_EGC), FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_PC980124), FALSE); +#endif return(TRUE); case WM_NOTIFY: - if ((((NMHDR *)lp)->code) == PSN_APPLY) { + if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) { update = 0; - b = GetDlgItemCheck(hWnd, IDC_GDC72020); + b = (UINT8)GetDlgItemCheck(hWnd, IDC_GDC72020); if (np2cfg.uPD72020 != b) { np2cfg.uPD72020 = b; update |= SYS_UPDATECFG; @@ -132,7 +143,7 @@ static LRESULT CALLBACK Scropt2DlgProc(H update |= SYS_UPDATECFG; gdcs.grphdisp |= GDCSCRN_ALLDRAW2; } - b = GetDlgItemCheck(hWnd, IDC_PC980124); + b = (UINT8)GetDlgItemCheck(hWnd, IDC_PC980124); if (np2cfg.color16 != b) { np2cfg.color16 = b; update |= SYS_UPDATECFG; @@ -148,9 +159,9 @@ static LRESULT CALLBACK Scropt2DlgProc(H static LRESULT CALLBACK Scropt3DlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { - char work[32]; - BYTE value[6]; - BYTE b; + TCHAR work[32]; + UINT8 value[6]; + UINT8 b; UINT update; switch(msg) { @@ -159,26 +170,26 @@ static LRESULT CALLBACK Scropt3DlgProc(H MAKELONG(0, 32)); SendDlgItemMessage(hWnd, IDC_TRAMWAIT, TBM_SETPOS, TRUE, np2cfg.wait[0]); - wsprintf(work, str_u, np2cfg.wait[0]); + wsprintf(work, tchar_u, np2cfg.wait[0]); SetDlgItemText(hWnd, IDC_TRAMSTR, work); SendDlgItemMessage(hWnd, IDC_VRAMWAIT, TBM_SETRANGE, TRUE, MAKELONG(0, 32)); SendDlgItemMessage(hWnd, IDC_VRAMWAIT, TBM_SETPOS, TRUE, np2cfg.wait[2]); - wsprintf(work, str_u, np2cfg.wait[2]); + wsprintf(work, tchar_u, np2cfg.wait[2]); SetDlgItemText(hWnd, IDC_VRAMSTR, work); SendDlgItemMessage(hWnd, IDC_GRCGWAIT, TBM_SETRANGE, TRUE, MAKELONG(0, 32)); SendDlgItemMessage(hWnd, IDC_GRCGWAIT, TBM_SETPOS, TRUE, np2cfg.wait[4]); - wsprintf(work, str_u, np2cfg.wait[4]); + wsprintf(work, tchar_u, np2cfg.wait[4]); SetDlgItemText(hWnd, IDC_GRCGSTR, work); SendDlgItemMessage(hWnd, IDC_REALPAL, TBM_SETRANGE, TRUE, MAKELONG(0, 64)); SendDlgItemMessage(hWnd, IDC_REALPAL, TBM_SETPOS, TRUE, np2cfg.realpal); - wsprintf(work, str_d, (int)np2cfg.realpal - 32); + wsprintf(work, tchar_d, (int)np2cfg.realpal - 32); SetDlgItemText(hWnd, IDC_REALPALSTR, work); return(TRUE); @@ -186,46 +197,49 @@ static LRESULT CALLBACK Scropt3DlgProc(H case WM_HSCROLL: switch(GetDlgCtrlID((HWND)lp)) { case IDC_TRAMWAIT: - b = (BYTE)SendDlgItemMessage(hWnd, IDC_TRAMWAIT, + b = (UINT8)SendDlgItemMessage(hWnd, IDC_TRAMWAIT, TBM_GETPOS, 0, 0); - wsprintf(work, str_u, b); + wsprintf(work, tchar_u, b); SetDlgItemText(hWnd, IDC_TRAMSTR, work); break; + case IDC_VRAMWAIT: - b = (BYTE)SendDlgItemMessage(hWnd, IDC_VRAMWAIT, + b = (UINT8)SendDlgItemMessage(hWnd, IDC_VRAMWAIT, TBM_GETPOS, 0, 0); - wsprintf(work, str_u, b); + wsprintf(work, tchar_u, b); SetDlgItemText(hWnd, IDC_VRAMSTR, work); break; + case IDC_GRCGWAIT: - b = (BYTE)SendDlgItemMessage(hWnd, IDC_GRCGWAIT, + b = (UINT8)SendDlgItemMessage(hWnd, IDC_GRCGWAIT, TBM_GETPOS, 0, 0); - wsprintf(work, str_u, b); + wsprintf(work, tchar_u, b); SetDlgItemText(hWnd, IDC_GRCGSTR, work); break; + case IDC_REALPAL: - b = (BYTE)SendDlgItemMessage(hWnd, IDC_REALPAL, + b = (UINT8)SendDlgItemMessage(hWnd, IDC_REALPAL, TBM_GETPOS, 0, 0); - wsprintf(work, str_d, (int)b - 32); + wsprintf(work, tchar_d, (int)b - 32); SetDlgItemText(hWnd, IDC_REALPALSTR, work); } break; case WM_NOTIFY: - if ((((NMHDR *)lp)->code) == PSN_APPLY) { + if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) { update = 0; ZeroMemory(value, sizeof(value)); - value[0] = (BYTE)SendDlgItemMessage(hWnd, IDC_TRAMWAIT, + value[0] = (UINT8)SendDlgItemMessage(hWnd, IDC_TRAMWAIT, TBM_GETPOS, 0, 0); if (value[0]) { value[1] = 1; } - value[2] = (BYTE)SendDlgItemMessage(hWnd, IDC_VRAMWAIT, + value[2] = (UINT8)SendDlgItemMessage(hWnd, IDC_VRAMWAIT, TBM_GETPOS, 0, 0); if (value[2]) { value[3] = 1; } - value[4] = (BYTE)SendDlgItemMessage(hWnd, IDC_GRCGWAIT, + value[4] = (UINT8)SendDlgItemMessage(hWnd, IDC_GRCGWAIT, TBM_GETPOS, 0, 0); if (value[4]) { value[5] = 1; @@ -236,7 +250,7 @@ static LRESULT CALLBACK Scropt3DlgProc(H update |= SYS_UPDATECFG; } } - b = (BYTE)SendDlgItemMessage(hWnd, IDC_REALPAL, + b = (UINT8)SendDlgItemMessage(hWnd, IDC_REALPAL, TBM_GETPOS, 0, 0); if (np2cfg.realpal != b) { np2cfg.realpal = b; @@ -257,7 +271,7 @@ void dialog_scropt(HWND hWnd) { PROPSHEETHEADER psh; HPROPSHEETPAGE hpsp[3]; - hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); + hinst = GetWindowInst(hWnd); ZeroMemory(&psp, sizeof(psp)); psp.dwSize = sizeof(PROPSHEETPAGE); @@ -278,12 +292,14 @@ void dialog_scropt(HWND hWnd) { ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_NOAPPLYNOW; + psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEHICON | PSH_USECALLBACK; psh.hwndParent = hWnd; psh.hInstance = hinst; + psh.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_ICON2)); psh.nPages = 3; psh.phpage = hpsp; psh.pszCaption = str_scropt; + psh.pfnCallback = np2class_propetysheet; PropertySheet(&psh); InvalidateRect(hWndMain, NULL, TRUE); }