np2/win9x/np2.cpp - diff

Return to np2.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x

Diff for /np2/win9x/np2.cpp between versions 1.73 and 1.74

version 1.73, 2007/07/20 15:02:29	version 1.74, 2007/11/11 07:11:27
Line 56	Line 56
#endif	#endif

static TCHAR szClassName[] = _T("NP2-MainWindow");	static TCHAR szClassName[] = _T("NP2-MainWindow");
HWND hWndMain;	HWND g_hWndMain;
HINSTANCE hInst;	HINSTANCE g_hInstance;
HINSTANCE hPrev;	HINSTANCE g_hPrevInst;
#if !defined(_WIN64)	#if !defined(_WIN64)
int mmxflag;	int mmxflag;
#endif	#endif
Line 158 WINLOCEX np2_winlocexallwin(HWND base) {	Line 158 WINLOCEX np2_winlocexallwin(HWND base) {
HWND list[5];	HWND list[5];

cnt = 0;	cnt = 0;
list[cnt++] = hWndMain;	list[cnt++] = g_hWndMain;
list[cnt++] = toolwin_gethwnd();	list[cnt++] = toolwin_gethwnd();
list[cnt++] = kdispwin_gethwnd();	list[cnt++] = kdispwin_gethwnd();
list[cnt++] = skbdwin_gethwnd();	list[cnt++] = skbdwin_gethwnd();
Line 168 WINLOCEX np2_winlocexallwin(HWND base) {	Line 168 WINLOCEX np2_winlocexallwin(HWND base) {
list[i] = NULL;	list[i] = NULL;
}	}
}	}
if (base != hWndMain) { // hWndMainのみ全体移動	if (base != g_hWndMain) { // hWndMainのみ全体移動
base = NULL;	base = NULL;
}	}
return(winlocex_create(base, list, cnt));	return(winlocex_create(base, list, cnt));
Line 197 static void changescreen(UINT8 newmode)	Line 197 static void changescreen(UINT8 newmode)
mdbgwin_destroy();	mdbgwin_destroy();
}	}
else if (renewal & SCRNMODE_ROTATEMASK) {	else if (renewal & SCRNMODE_ROTATEMASK) {
wlex = np2_winlocexallwin(hWndMain);	wlex = np2_winlocexallwin(g_hWndMain);
winlocex_setholdwnd(wlex, hWndMain);	winlocex_setholdwnd(wlex, g_hWndMain);
}	}
soundmng_stop();	soundmng_stop();
mousemng_disable(MOUSEPROC_WINUI);	mousemng_disable(MOUSEPROC_WINUI);
Line 216 static void changescreen(UINT8 newmode)	Line 216 static void changescreen(UINT8 newmode)
if (renewal & SCRNMODE_FULLSCREEN) {	if (renewal & SCRNMODE_FULLSCREEN) {
if (!scrnmng_isfullscreen()) {	if (!scrnmng_isfullscreen()) {
if (np2oscfg.toolwin) {	if (np2oscfg.toolwin) {
toolwin_create();	toolwin_create(g_hInstance);
}	}
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
kdispwin_create();	kdispwin_create(g_hInstance);
}	}
}	}
}	}
Line 253 static void wincentering(HWND hWnd) {	Line 253 static void wincentering(HWND hWnd) {
np2oscfg.winy = 0;	np2oscfg.winy = 0;
}	}
sysmng_update(SYS_UPDATEOSCFG);	sysmng_update(SYS_UPDATEOSCFG);
MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, width, height, TRUE);	MoveWindow(g_hWndMain, np2oscfg.winx, np2oscfg.winy, width, height, TRUE);
}	}

void np2active_renewal(void) { // ver0.30	void np2active_renewal(void) { // ver0.30
Line 329 static int flagload(const OEMCHAR *ext,	Line 329 static int flagload(const OEMCHAR *ext,
id = IDYES;	id = IDYES;
ret = statsave_check(path, buf, NELEMENTS(buf));	ret = statsave_check(path, buf, NELEMENTS(buf));
if (ret & (~STATFLAG_DISKCHG)) {	if (ret & (~STATFLAG_DISKCHG)) {
MessageBox(hWndMain, _T("Couldn't restart"), title,	MessageBox(g_hWndMain, _T("Couldn't restart"), title,
MB_OK \| MB_ICONSTOP);	MB_OK \| MB_ICONSTOP);
id = IDNO;	id = IDNO;
}	}
else if ((!force) && (ret & STATFLAG_DISKCHG)) {	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
OEMCHAR buf2[1024 + 256];	OEMCHAR buf2[1024 + 256];
OEMSPRINTF(buf2, OEMTEXT("Conflict!\n\n%s\nContinue?"), buf);	OEMSPRINTF(buf2, OEMTEXT("Conflict!\n\n%s\nContinue?"), buf);
id = MessageBox(hWndMain, buf2, title,	id = MessageBox(g_hWndMain, buf2, title,
MB_YESNOCANCEL \| MB_ICONQUESTION);	MB_YESNOCANCEL \| MB_ICONQUESTION);
}	}
if (id == IDYES) {	if (id == IDYES) {
Line 373 static void np2popup(HWND hWnd, LPARAM l	Line 373 static void np2popup(HWND hWnd, LPARAM l
DestroyMenu(hMenu);	DestroyMenu(hMenu);
}	}

static void np2cmd(HWND hWnd, UINT16 cmd) {	static void OnCommand(HWND hWnd, WPARAM wParam)
	{
HINSTANCE hinst;	HINSTANCE hInstance;
UINT update;	UINT update;
	UINT uID;
BOOL b;	BOOL b;

hinst = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);	hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
update = 0;	update = 0;
switch(cmd) {	uID = LOWORD(wParam);
	switch(uID)
	{
case IDM_RESET:	case IDM_RESET:
b = FALSE;	b = FALSE;
if (!np2oscfg.comfirm) {	if (!np2oscfg.comfirm) {
Line 406 static void np2cmd(HWND hWnd, UINT16 cmd	Line 409 static void np2cmd(HWND hWnd, UINT16 cmd
case IDM_CONFIG:	case IDM_CONFIG:
winuienter();	winuienter();
sstpmsg_config();	sstpmsg_config();
DialogBox(hinst, MAKEINTRESOURCE(IDD_CONFIG),	DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG),
hWnd, (DLGPROC)CfgDialogProc);	hWnd, (DLGPROC)CfgDialogProc);
if (!scrnmng_isfullscreen()) {	if (!scrnmng_isfullscreen()) {
UINT8 thick;	UINT8 thick;
Line 859 static void np2cmd(HWND hWnd, UINT16 cmd	Line 862 static void np2cmd(HWND hWnd, UINT16 cmd

case IDM_MPUPC98:	case IDM_MPUPC98:
winuienter();	winuienter();
DialogBox(hinst, MAKEINTRESOURCE(IDD_MPUPC98),	DialogBox(hInstance, MAKEINTRESOURCE(IDD_MPUPC98),
hWnd, (DLGPROC)MidiDialogProc);	hWnd, (DLGPROC)MidiDialogProc);
winuileave();	winuileave();
break;	break;
Line 907 static void np2cmd(HWND hWnd, UINT16 cmd	Line 910 static void np2cmd(HWND hWnd, UINT16 cmd

case IDM_CALENDAR:	case IDM_CALENDAR:
winuienter();	winuienter();
DialogBox(hinst, MAKEINTRESOURCE(IDD_CALENDAR),	DialogBox(hInstance, MAKEINTRESOURCE(IDD_CALENDAR),
hWnd, (DLGPROC)ClndDialogProc);	hWnd, (DLGPROC)ClndDialogProc);
winuileave();	winuileave();
break;	break;
Line 955 static void np2cmd(HWND hWnd, UINT16 cmd	Line 958 static void np2cmd(HWND hWnd, UINT16 cmd
sstpmsg_about();	sstpmsg_about();
if (sstp_result() != SSTP_SENDING) {	if (sstp_result() != SSTP_SENDING) {
winuienter();	winuienter();
DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUT),	DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUT),
hWnd, (DLGPROC)AboutDialogProc);	hWnd, (DLGPROC)AboutDialogProc);
winuileave();	winuileave();
}	}
Line 963 static void np2cmd(HWND hWnd, UINT16 cmd	Line 966 static void np2cmd(HWND hWnd, UINT16 cmd

default:	default:
#if defined(SUPPORT_STATSAVE)	#if defined(SUPPORT_STATSAVE)
if ((cmd >= IDM_FLAGSAVE) &&	if ((uID >= IDM_FLAGSAVE) &&
(cmd < (IDM_FLAGSAVE + SUPPORT_STATSAVE))) {	(uID < (IDM_FLAGSAVE + SUPPORT_STATSAVE))) {
OEMCHAR ext[4];	OEMCHAR ext[4];
OEMSPRINTF(ext, np2flagext, cmd - IDM_FLAGSAVE);	OEMSPRINTF(ext, np2flagext, uID - IDM_FLAGSAVE);
flagsave(ext);	flagsave(ext);
}	}
else if ((cmd >= IDM_FLAGLOAD) &&	else if ((uID >= IDM_FLAGLOAD) &&
(cmd < (IDM_FLAGLOAD + SUPPORT_STATSAVE))) {	(uID < (IDM_FLAGLOAD + SUPPORT_STATSAVE))) {
OEMCHAR ext[4];	OEMCHAR ext[4];
OEMSPRINTF(ext, np2flagext, cmd - IDM_FLAGLOAD);	OEMSPRINTF(ext, np2flagext, uID - IDM_FLAGLOAD);
flagload(ext, OEMTEXT("Status Load"), TRUE);	flagload(ext, OEMTEXT("Status Load"), TRUE);
}	}
#endif	#endif
Line 1007 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1010 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_TOOLWIN:	case IDM_TOOLWIN:
sysmenu_settoolwin(np2oscfg.toolwin ^ 1);	sysmenu_settoolwin(np2oscfg.toolwin ^ 1);
if (np2oscfg.toolwin) {	if (np2oscfg.toolwin) {
toolwin_create();	toolwin_create(g_hInstance);
}	}
else {	else {
toolwin_destroy();	toolwin_destroy();
Line 1019 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1022 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_KEYDISP:	case IDM_KEYDISP:
sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);	sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
kdispwin_create();	kdispwin_create(g_hInstance);
}	}
else {	else {
kdispwin_destroy();	kdispwin_destroy();
Line 1028 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1031 LRESULT CALLBACK WndProc(HWND hWnd, UINT
#endif	#endif
#if defined(SUPPORT_SOFTKBD)	#if defined(SUPPORT_SOFTKBD)
case IDM_SOFTKBD:	case IDM_SOFTKBD:
skbdwin_create();	skbdwin_create(g_hInstance);
break;	break;
#endif	#endif
#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)	#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
case IDM_MEMDBG32:	case IDM_MEMDBG32:
mdbgwin_create();	mdbgwin_create(g_hInstance);
break;	break;
#endif	#endif
case IDM_SCREENCENTER:	case IDM_SCREENCENTER:
Line 1067 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1070 LRESULT CALLBACK WndProc(HWND hWnd, UINT
break;	break;

case IDM_DEBUGUTY:	case IDM_DEBUGUTY:
viewer_open();	viewer_open(g_hInstance);
break;	break;

case IDM_SCRNMUL4:	case IDM_SCRNMUL4:
Line 1077 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1080 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_SCRNMUL12:	case IDM_SCRNMUL12:
case IDM_SCRNMUL16:	case IDM_SCRNMUL16:
if ((!scrnmng_isfullscreen()) &&	if ((!scrnmng_isfullscreen()) &&
!(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) {	!(GetWindowLong(g_hWndMain, GWL_STYLE) & WS_MINIMIZE))
	{
sysmenu_setscrnmul((UINT8)(wParam - IDM_SCRNMUL));	sysmenu_setscrnmul((UINT8)(wParam - IDM_SCRNMUL));
scrnmng_setmultiple((int)(wParam - IDM_SCRNMUL));	scrnmng_setmultiple((int)(wParam - IDM_SCRNMUL));
}	}
Line 1115 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1119 LRESULT CALLBACK WndProc(HWND hWnd, UINT
break;	break;

case WM_COMMAND:	case WM_COMMAND:
np2cmd(hWnd, LOWORD(wParam));	OnCommand(hWnd, wParam);
break;	break;

case WM_ACTIVATE:	case WM_ACTIVATE:
Line 1135 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1139 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case WM_PAINT:	case WM_PAINT:
hdc = BeginPaint(hWnd, &ps);	hdc = BeginPaint(hWnd, &ps);
if (np2opening) {	if (np2opening) {
HINSTANCE hinst;	HINSTANCE hInstance;
RECT rect;	RECT rect;
int width;	int width;
int height;	int height;
Line 1143 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1147 LRESULT CALLBACK WndProc(HWND hWnd, UINT
BITMAP bmp;	BITMAP bmp;
HDC hmdc;	HDC hmdc;
HBRUSH hbrush;	HBRUSH hbrush;
hinst = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);	hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
GetClientRect(hWnd, &rect);	GetClientRect(hWnd, &rect);
width = rect.right - rect.left;	width = rect.right - rect.left;
height = rect.bottom - rect.top;	height = rect.bottom - rect.top;
hbmp = LoadBitmap(hinst, _T("NP2BMP"));	hbmp = LoadBitmap(hInstance, _T("NP2BMP"));
GetObject(hbmp, sizeof(BITMAP), &bmp);	GetObject(hbmp, sizeof(BITMAP), &bmp);
hbrush = (HBRUSH)SelectObject(hdc,	hbrush = (HBRUSH)SelectObject(hdc,
GetStockObject(BLACK_BRUSH));	GetStockObject(BLACK_BRUSH));
Line 1223 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1227 LRESULT CALLBACK WndProc(HWND hWnd, UINT

case WM_KEYDOWN:	case WM_KEYDOWN:
if (wParam == VK_F11) {	if (wParam == VK_F11) {
np2class_enablemenu(hWndMain, TRUE);	np2class_enablemenu(g_hWndMain, TRUE);
return(DefWindowProc(hWnd, WM_SYSKEYDOWN, VK_F10, lParam));	return(DefWindowProc(hWnd, WM_SYSKEYDOWN, VK_F10, lParam));
}	}
if ((wParam == VK_F12) && (!np2oscfg.F12COPY)) {	if ((wParam == VK_F12) && (!np2oscfg.F12COPY)) {
Line 1464 static void processwait(UINT cnt) {	Line 1468 static void processwait(UINT cnt) {
soundmng_sync();	soundmng_sync();
}	}

int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,	int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,
LPSTR lpszCmdLine, int nCmdShow) {	LPSTR lpszCmdLine, int nCmdShow) {
WNDCLASS wc;	WNDCLASS wc;
MSG msg;	MSG msg;
Line 1502 int WINAPI WinMain(HINSTANCE hInstance,	Line 1506 int WINAPI WinMain(HINSTANCE hInstance,
return(FALSE);	return(FALSE);
}	}

hInst = loadextinst(hInstance);	g_hInstance = loadextinst(hInstance);
hPrev = hPreInst;	g_hPrevInst = hPrevInst;
#if !defined(_WIN64)	#if !defined(_WIN64)
mmxflag = (havemmx())?0:MMXFLAG_NOTSUPPORT;	mmxflag = (havemmx())?0:MMXFLAG_NOTSUPPORT;
mmxflag += (np2oscfg.disablemmx)?MMXFLAG_DISABLE:0;	mmxflag += (np2oscfg.disablemmx)?MMXFLAG_DISABLE:0;
Line 1528 int WINAPI WinMain(HINSTANCE hInstance,	Line 1532 int WINAPI WinMain(HINSTANCE hInstance,
winkbd_setf12(np2oscfg.F12COPY);	winkbd_setf12(np2oscfg.F12COPY);
keystat_initialize();	keystat_initialize();

np2class_initialize(hInst);	np2class_initialize(hInstance);
if (!hPreInst) {	if (!hPrevInst) {
wc.style = CS_BYTEALIGNCLIENT \| CS_HREDRAW \| CS_VREDRAW \| CS_DBLCLKS;	wc.style = CS_BYTEALIGNCLIENT \| CS_HREDRAW \| CS_VREDRAW \| CS_DBLCLKS;
wc.lpfnWndProc = WndProc;	wc.lpfnWndProc = WndProc;
wc.cbClsExtra = 0;	wc.cbClsExtra = 0;
wc.cbWndExtra = NP2GWLP_SIZE;	wc.cbWndExtra = NP2GWLP_SIZE;
wc.hInstance = hInst;	wc.hInstance = hInstance;
wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON1));	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON1));
wc.hCursor = LoadCursor(NULL, IDC_ARROW);	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);	wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAIN);	wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAIN);
Line 1546 int WINAPI WinMain(HINSTANCE hInstance,	Line 1550 int WINAPI WinMain(HINSTANCE hInstance,
dosio_term();	dosio_term();
return(FALSE);	return(FALSE);
}	}

	toolwin_initapp(hInstance);
	kdispwin_initialize(hInstance);
	skbdwin_initialize(hInstance);
	mdbgwin_initialize(hInstance);
	viewer_init(hInstance);
}	}
toolwin_initapp(hInst);
kdispwin_initialize(hPreInst);
skbdwin_initialize(hPreInst);
mdbgwin_initialize(hPreInst);
viewer_init(hPreInst);

mousemng_initialize();	mousemng_initialize();

Line 1561 int WINAPI WinMain(HINSTANCE hInstance,	Line 1566 int WINAPI WinMain(HINSTANCE hInstance,
}	}
hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles, style,	hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles, style,
np2oscfg.winx, np2oscfg.winy, 640, 400,	np2oscfg.winx, np2oscfg.winy, 640, 400,
NULL, NULL, hInst, NULL);	NULL, NULL, hInstance, NULL);
hWndMain = hWnd;	g_hWndMain = hWnd;
scrnmng_initialize();	scrnmng_initialize();

xmenu_setroltate(0);	xmenu_setroltate(0);
Line 1702 int WINAPI WinMain(HINSTANCE hInstance,	Line 1707 int WINAPI WinMain(HINSTANCE hInstance,

if (!(scrnmode & SCRNMODE_FULLSCREEN)) {	if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
if (np2oscfg.toolwin) {	if (np2oscfg.toolwin) {
toolwin_create();	toolwin_create(hInstance);
}	}
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
kdispwin_create();	kdispwin_create(hInstance);
}	}
}	}

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.73
changed lines
	Added in v.1.74