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.18 and 1.21

version 1.18, 2003/10/30 16:54:04	version 1.21, 2003/11/01 22:23:04
Line 71 static char szClassName[] = "NP2-MainWi	Line 71 static char szClassName[] = "NP2-MainWi
{0, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34	{0, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34
{0, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34	{0, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34
0xffffff, 0xffbf6a, 0, 0,	0xffffff, 0xffbf6a, 0, 0,
0, 1, 0, 9801, 0, 0, 0, 0, 0, 0}; // ver0.38	0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0}; // ver0.38

char fddfolder[MAX_PATH];	char fddfolder[MAX_PATH];
char hddfolder[MAX_PATH];	char hddfolder[MAX_PATH];
Line 86 static BYTE np2stopemulate = 0;	Line 86 static BYTE np2stopemulate = 0;
static int np2opening = 1;	static int np2opening = 1;
static int np2quitmsg = 0;	static int np2quitmsg = 0;
HMENU hStat = NULL;	HMENU hStat = NULL;
	static BYTE scrnmode;
	WINLOC wl;
	WINLOCEX wlex;

static const char np2help[] = "np2.hlp";	static const char np2help[] = "np2.hlp";
static const char np2resume[] = "sav";	static const char np2flagext[] = "S%02d";
	static const char np2resumeext[] = "sav";

static BYTE scrnmode;


static void winuienter(void) {	static void winuienter(void) {
Line 106 static void winuileave(void) {	Line 107 static void winuileave(void) {
soundmng_enable(SNDPROC_MAIN);	soundmng_enable(SNDPROC_MAIN);
}	}

	WINLOCEX np2_winlocexallwin(HWND base) {

	HWND list[3];
	UINT i;

	list[0] = hWndMain;
	list[1] = toolwin_gethwnd();
	list[2] = keydisp_gethwnd();
	for (i=0; i<3; i++) {
	if (list[i] == base) {
	list[i] = NULL;
	}
	}
	if (base != hWndMain) { // hWndMainのみ全体移動
	base = NULL;
	}
	return(winlocex_create(base, list, 3));
	}

static void changescreen(BYTE newmode) {	static void changescreen(BYTE newmode) {

BYTE change;	BYTE change;
BYTE renewal;	BYTE renewal;

change = scrnmode ^ newmode;	change = scrnmode ^ newmode;
renewal = (change & SCRNMODE_FULLSCREEN);	renewal = (change & SCRNMODE_FULLSCREEN);
Line 121 static void changescreen(BYTE newmode) {	Line 141 static void changescreen(BYTE newmode) {
}	}
if (renewal) {	if (renewal) {
if (renewal & SCRNMODE_FULLSCREEN) {	if (renewal & SCRNMODE_FULLSCREEN) {
toolwin_close();	toolwin_destroy();
	keydisp_destroy();
}	}
else if (renewal & SCRNMODE_ROTATEMASK) {	else if (renewal & SCRNMODE_ROTATEMASK) {
toolwin_movingstart();	winlocex_destroy(wlex);
	wlex = np2_winlocexallwin(hWndMain);
}	}
soundmng_stop();	soundmng_stop();
mouse_running(MOUSE_STOP);	mouse_running(MOUSE_STOP);
keydisp_destroy();
scrnmng_destroy();	scrnmng_destroy();
if (scrnmng_create(newmode) == SUCCESS) {	if (scrnmng_create(newmode) == SUCCESS) {
scrnmode = newmode;	scrnmode = newmode;
Line 140 static void changescreen(BYTE newmode) {	Line 161 static void changescreen(BYTE newmode) {
}	}
}	}
scrndraw_redraw();	scrndraw_redraw();
if ((renewal & SCRNMODE_FULLSCREEN) &&	if (renewal & SCRNMODE_FULLSCREEN) {
(!scrnmng_isfullscreen()) && (np2oscfg.toolwin)) {	if (!scrnmng_isfullscreen()) {
toolwin_open();	if (np2oscfg.toolwin) {
	toolwin_create();
	}
	if (np2oscfg.keydisp) {
	keydisp_create();
	}
	}
}	}
else if (renewal & SCRNMODE_ROTATEMASK) {	else if (renewal & SCRNMODE_ROTATEMASK) {
toolwin_movingend();	winlocex_move(wlex);
	winlocex_destroy(wlex);
	wlex = NULL;
}	}
mouse_running(MOUSE_CONT);	mouse_running(MOUSE_CONT);
soundmng_play();	soundmng_play();
Line 275 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 304 LRESULT CALLBACK WndProc(HWND hWnd, UINT
HDC hdc;	HDC hdc;
BOOL b;	BOOL b;
UINT update;	UINT update;
	HWND subwin;

switch (msg) {	switch (msg) {
case WM_CREATE:	case WM_CREATE:
Line 288 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 318 LRESULT CALLBACK WndProc(HWND hWnd, UINT
update = 0;	update = 0;
switch(wParam) {	switch(wParam) {
case IDM_TOOLWIN:	case IDM_TOOLWIN:
xmenu_settoolwin(np2oscfg.toolwin ^ 1);	sysmenu_settoolwin(np2oscfg.toolwin ^ 1);
if (np2oscfg.toolwin) {	if (np2oscfg.toolwin) {
toolwin_open();	toolwin_create();
}	}
else {	else {
toolwin_close();	toolwin_destroy();
}	}
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

	case IDM_KEYDISP:
	sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
	if (np2oscfg.keydisp) {
	keydisp_create();
	}
	else {
	keydisp_destroy();
	}
	break;

case IDM_SCREENCENTER:	case IDM_SCREENCENTER:
if ((!scrnmng_isfullscreen()) &&	if ((!scrnmng_isfullscreen()) &&
(!(GetWindowLong(hWnd, GWL_STYLE) &	(!(GetWindowLong(hWnd, GWL_STYLE) &
(WS_MAXIMIZE \| WS_MINIMIZE)))) {	(WS_MAXIMIZE \| WS_MINIMIZE)))) {
toolwin_movingstart();	winlocex_destroy(wlex);
	wlex = np2_winlocexallwin(hWnd);
wincentering(hWnd);	wincentering(hWnd);
toolwin_movingend();	winlocex_move(wlex);
	winlocex_destroy(wlex);
	wlex = NULL;
}	}
break;	break;

case IDM_SNAPENABLE:	case IDM_SNAPENABLE:
xmenu_setwinsnap(np2oscfg.WINSNAP ^ 1);	sysmenu_setwinsnap(np2oscfg.WINSNAP ^ 1);
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_BACKGROUND:	case IDM_BACKGROUND:
xmenu_setbackground(np2oscfg.background ^ 1);	sysmenu_setbackground(np2oscfg.background ^ 1);
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_BGSOUND:	case IDM_BGSOUND:
xmenu_setbgsound(np2oscfg.background ^ 2);	sysmenu_setbgsound(np2oscfg.background ^ 2);
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_KEYDISP:
keydisp_create();
break;

case IDM_MEMORYDUMP:	case IDM_MEMORYDUMP:
debugsub_memorydump();	debugsub_memorydump();
break;	break;
Line 343 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 382 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_SCRNMUL16:	case IDM_SCRNMUL16:
if ((!scrnmng_isfullscreen()) &&	if ((!scrnmng_isfullscreen()) &&
!(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) {	!(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) {
xmenu_setscrnmul(wParam - IDM_SCRNMUL);	sysmenu_setscrnmul(wParam - IDM_SCRNMUL);
scrnmng_setmultiple(wParam - IDM_SCRNMUL);	scrnmng_setmultiple(wParam - IDM_SCRNMUL);
}	}
break;	break;

	case SC_MINIMIZE:
	winlocex_destroy(wlex);
	wlex = np2_winlocexallwin(hWnd);
	winlocex_close(wlex);
	winlocex_destroy(wlex);
	wlex = NULL;
	return(DefWindowProc(hWnd, msg, wParam, lParam));

	case SC_RESTORE:
	subwin = toolwin_gethwnd();
	if (subwin) {
	ShowWindow(subwin, SW_SHOWNOACTIVATE);
	}
	subwin = keydisp_gethwnd();
	if (subwin) {
	ShowWindow(subwin, SW_SHOWNOACTIVATE);
	}
	return(DefWindowProc(hWnd, msg, wParam, lParam));

default:	default:
return(DefWindowProc(hWnd, msg, wParam, lParam));	return(DefWindowProc(hWnd, msg, wParam, lParam));
}	}
Line 552 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 610 LRESULT CALLBACK WndProc(HWND hWnd, UINT

case IDM_F12MOUSE:	case IDM_F12MOUSE:
xmenu_setf12copy(0);	xmenu_setf12copy(0);
keystat_resetcopyhelp();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

case IDM_F12COPY:	case IDM_F12COPY:
xmenu_setf12copy(1);	xmenu_setf12copy(1);
keystat_resetcopyhelp();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

case IDM_F12STOP:	case IDM_F12STOP:
xmenu_setf12copy(2);	xmenu_setf12copy(2);
keystat_resetcopyhelp();	winkbd_resetf12();
	update \|= SYS_UPDATECFG;
	break;

	case IDM_F12EQU:
	xmenu_setf12copy(3);
	winkbd_resetf12();
	update \|= SYS_UPDATECFG;
	break;

	case IDM_F12COMMA:
	xmenu_setf12copy(4);
	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

Line 808 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 878 LRESULT CALLBACK WndProc(HWND hWnd, UINT
if ((LOWORD(wParam) >= IDM_FLAGSAVE) &&	if ((LOWORD(wParam) >= IDM_FLAGSAVE) &&
(LOWORD(wParam) < IDM_FLAGSAVE + STATSAVEMAX)) {	(LOWORD(wParam) < IDM_FLAGSAVE + STATSAVEMAX)) {
char ext[4];	char ext[4];
wsprintf(ext, "S%02d",	wsprintf(ext, np2flagext,
(LOWORD(wParam) - IDM_FLAGSAVE) % 100);	(LOWORD(wParam) - IDM_FLAGSAVE) % 100);
flagsave(ext);	flagsave(ext);
}	}
if ((LOWORD(wParam) >= IDM_FLAGLOAD) &&	if ((LOWORD(wParam) >= IDM_FLAGLOAD) &&
(LOWORD(wParam) < IDM_FLAGLOAD + STATSAVEMAX)) {	(LOWORD(wParam) < IDM_FLAGLOAD + STATSAVEMAX)) {
char ext[4];	char ext[4];
wsprintf(ext, "S%02d",	wsprintf(ext, np2flagext,
(LOWORD(wParam) - IDM_FLAGLOAD) % 100);	(LOWORD(wParam) - IDM_FLAGLOAD) % 100);
flagload(ext, "Status Load", TRUE);	flagload(ext, "Status Load", TRUE);
}	}
Line 887 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 957 LRESULT CALLBACK WndProc(HWND hWnd, UINT
np2oscfg.winy = rc.top;	np2oscfg.winy = rc.top;
sysmng_update(SYS_UPDATEOSCFG);	sysmng_update(SYS_UPDATEOSCFG);
}	}
if (GetWindowLong(hWnd, GWL_STYLE) & WS_MINIMIZE) {
toolwin_close();
}
else if (np2oscfg.toolwin) {
toolwin_open();
}
}	}
break;	break;

Line 910 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 974 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case WM_ENTERSIZEMOVE:	case WM_ENTERSIZEMOVE:
soundmng_disable(SNDPROC_MAIN);	soundmng_disable(SNDPROC_MAIN);
mouse_running(MOUSE_STOP);	mouse_running(MOUSE_STOP);
winloc_movingstart();	winlocex_destroy(wlex);
toolwin_movingstart();	wlex = np2_winlocexallwin(hWnd);
break;

case WM_EXITSIZEMOVE:
toolwin_movingend();
mouse_running(MOUSE_CONT);
soundmng_enable(SNDPROC_MAIN);
break;	break;

case WM_MOVING:	case WM_MOVING:
if (np2oscfg.WINSNAP) {	if (np2oscfg.WINSNAP) {
winloc_movingproc((RECT *)lParam);	winlocex_moving(wlex, (RECT *)lParam);
}	}
break;	break;

	case WM_EXITSIZEMOVE:
	winlocex_move(wlex);
	winlocex_destroy(wlex);
	wlex = NULL;
	mouse_running(MOUSE_CONT);
	soundmng_enable(SNDPROC_MAIN);
	break;

case WM_KEYDOWN:	case WM_KEYDOWN:
if (wParam == VK_F11) {	if (wParam == VK_F11) {
scrnmng_enablemenubar();	scrnmng_enablemenubar();
Line 937 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1003 LRESULT CALLBACK WndProc(HWND hWnd, UINT
sysmng_update(SYS_UPDATECFG);	sysmng_update(SYS_UPDATECFG);
}	}
else {	else {
winkeydown106(wParam, lParam);	winkbd_keydown(wParam, lParam);
}	}
break;	break;

Line 946 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1012 LRESULT CALLBACK WndProc(HWND hWnd, UINT
return(DefWindowProc(hWnd, WM_SYSKEYUP, VK_F10, lParam));	return(DefWindowProc(hWnd, WM_SYSKEYUP, VK_F10, lParam));
}	}
if ((wParam != VK_F12) \|\| (np2oscfg.F12COPY)) {	if ((wParam != VK_F12) \|\| (np2oscfg.F12COPY)) {
winkeyup106(wParam, lParam);	winkbd_keyup(wParam, lParam);
}	}
break;	break;

Line 961 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1027 LRESULT CALLBACK WndProc(HWND hWnd, UINT
break;	break;
}	}
}	}
winkeydown106(wParam, lParam);	winkbd_keydown(wParam, lParam);
break;	break;

case WM_SYSKEYUP:	case WM_SYSKEYUP:
winkeyup106(wParam, lParam);	winkbd_keyup(wParam, lParam);
break;	break;

case WM_MOUSEMOVE:	case WM_MOUSEMOVE:
Line 1146 int WINAPI WinMain(HINSTANCE hInstance,	Line 1212 int WINAPI WinMain(HINSTANCE hInstance,
np2arg_analize(lpszCmdLine);	np2arg_analize(lpszCmdLine);
initload();	initload();
toolwin_readini();	toolwin_readini();
	keydisp_readini();

rand_setseed((unsigned)time(NULL));	rand_setseed((unsigned)time(NULL));

Line 1258 int WINAPI WinMain(HINSTANCE hInstance,	Line 1325 int WINAPI WinMain(HINSTANCE hInstance,
EnableMenuItem(GetMenu(hWndMain), IDM_HELP, MF_GRAYED);	EnableMenuItem(GetMenu(hWndMain), IDM_HELP, MF_GRAYED);
}	}

xmenu_settoolwin(np2oscfg.toolwin);	sysmenu_settoolwin(np2oscfg.toolwin);
xmenu_setwinsnap(np2oscfg.WINSNAP);	sysmenu_setkeydisp(np2oscfg.keydisp);
xmenu_setbackground(np2oscfg.background);	sysmenu_setwinsnap(np2oscfg.WINSNAP);
xmenu_setbgsound(np2oscfg.background);	sysmenu_setbackground(np2oscfg.background);
xmenu_setscrnmul(8); // ver0.26	sysmenu_setbgsound(np2oscfg.background);
	sysmenu_setscrnmul(8); // ver0.26
if (np2oscfg.toolwin) {
toolwin_open();
}

scrnmode = 0;	scrnmode = 0;
if (np2arg.fullscreen) {	if (np2arg.fullscreen) {
Line 1285 int WINAPI WinMain(HINSTANCE hInstance,	Line 1349 int WINAPI WinMain(HINSTANCE hInstance,
return(FALSE);	return(FALSE);
}	}
}	}
	if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
	if (np2oscfg.toolwin) {
	toolwin_create();
	}
	if (np2oscfg.keydisp) {
	keydisp_create();
	}
	}

if (soundmng_initialize() == SUCCESS) {	if (soundmng_initialize() == SUCCESS) {
soundmng_pcmload(SOUND_PCMSEEK, "SEEKWAV", EXTROMIO_RES);	soundmng_pcmload(SOUND_PCMSEEK, "SEEKWAV", EXTROMIO_RES);
Line 1326 int WINAPI WinMain(HINSTANCE hInstance,	Line 1398 int WINAPI WinMain(HINSTANCE hInstance,
if (np2oscfg.resume) {	if (np2oscfg.resume) {
int id;	int id;

id = flagload(np2resume, "Resume", FALSE);	id = flagload(np2resumeext, "Resume", FALSE);
if (id == IDYES) {	if (id == IDYES) {
for (i=0; i<4; i++) np2arg.disk[i] = NULL;	for (i=0; i<4; i++) np2arg.disk[i] = NULL;
}	}
Line 1359 int WINAPI WinMain(HINSTANCE hInstance,	Line 1431 int WINAPI WinMain(HINSTANCE hInstance,
if (!GetMessage(&msg, NULL, 0, 0)) {	if (!GetMessage(&msg, NULL, 0, 0)) {
break;	break;
}	}
if ((msg.message != WM_SYSKEYDOWN) &&	if ((msg.hwnd != hWndMain) \|\|
(msg.message != WM_SYSKEYUP)) {	((msg.message != WM_SYSKEYDOWN) &&
	(msg.message != WM_SYSKEYUP))) {
TranslateMessage(&msg);	TranslateMessage(&msg);
}	}
DispatchMessage(&msg);	DispatchMessage(&msg);
Line 1440 int WINAPI WinMain(HINSTANCE hInstance,	Line 1513 int WINAPI WinMain(HINSTANCE hInstance,
DispatchMessage(&msg);	DispatchMessage(&msg);
}	}
}	}
toolwin_close();	toolwin_destroy();

pccore_cfgupdate();	pccore_cfgupdate();

Line 1448 int WINAPI WinMain(HINSTANCE hInstance,	Line 1521 int WINAPI WinMain(HINSTANCE hInstance,
S98_trash();	S98_trash();

if (np2oscfg.resume) {	if (np2oscfg.resume) {
flagsave(np2resume);	flagsave(np2resumeext);
}	}
else {	else {
flagdelete(np2resume);	flagdelete(np2resumeext);
}	}

#ifdef USE_ROMEO	#ifdef USE_ROMEO
Line 1471 int WINAPI WinMain(HINSTANCE hInstance,	Line 1544 int WINAPI WinMain(HINSTANCE hInstance,
if (sys_updates & (SYS_UPDATECFG \| SYS_UPDATEOSCFG)) {	if (sys_updates & (SYS_UPDATECFG \| SYS_UPDATEOSCFG)) {
initsave();	initsave();
toolwin_writeini();	toolwin_writeini();
	keydisp_writeini();
}	}

TRACETERM();	TRACETERM();

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

Removed from v.1.18
changed lines
	Added in v.1.21