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.39 and 1.47

version 1.39, 2004/02/13 20:31:55	version 1.47, 2004/03/31 14:02:51
Line 41	Line 41
#include "diskdrv.h"	#include "diskdrv.h"
#include "fddfile.h"	#include "fddfile.h"
#include "timing.h"	#include "timing.h"
	#include "keystat.h"
#include "debugsub.h"	#include "debugsub.h"
#include "keydisp.h"	#include "subwind.h"
#include "kdispwin.h"
#include "viewer.h"	#include "viewer.h"


Line 106 static void winuileave(void) {	Line 106 static void winuileave(void) {

WINLOCEX np2_winlocexallwin(HWND base) {	WINLOCEX np2_winlocexallwin(HWND base) {

HWND list[3];
UINT i;	UINT i;
	UINT cnt;
	HWND list[4];

list[0] = hWndMain;	cnt = 0;
list[1] = toolwin_gethwnd();	list[cnt++] = hWndMain;
list[2] = kdispwin_gethwnd();	list[cnt++] = toolwin_gethwnd();
for (i=0; i<3; i++) {	list[cnt++] = kdispwin_gethwnd();
	list[cnt++] = skbdwin_gethwnd();
	for (i=0; i<cnt; i++) {
if (list[i] == base) {	if (list[i] == base) {
list[i] = NULL;	list[i] = NULL;
}	}
Line 120 WINLOCEX np2_winlocexallwin(HWND base) {	Line 123 WINLOCEX np2_winlocexallwin(HWND base) {
if (base != hWndMain) { // hWndMainのみ全体移動	if (base != hWndMain) { // hWndMainのみ全体移動
base = NULL;	base = NULL;
}	}
return(winlocex_create(base, list, 3));	return(winlocex_create(base, list, cnt));
}	}

static void changescreen(BYTE newmode) {	static void changescreen(BYTE newmode) {
Line 142 static void changescreen(BYTE newmode) {	Line 145 static void changescreen(BYTE newmode) {
if (renewal & SCRNMODE_FULLSCREEN) {	if (renewal & SCRNMODE_FULLSCREEN) {
toolwin_destroy();	toolwin_destroy();
kdispwin_destroy();	kdispwin_destroy();
	skbdwin_destroy();
}	}
else if (renewal & SCRNMODE_ROTATEMASK) {	else if (renewal & SCRNMODE_ROTATEMASK) {
wlex = np2_winlocexallwin(hWndMain);	wlex = np2_winlocexallwin(hWndMain);
Line 275 static int flagload(const char *ext, con	Line 279 static int flagload(const char *ext, con
winuienter();	winuienter();
id = IDYES;	id = IDYES;
ret = statsave_check(path, buf, sizeof(buf));	ret = statsave_check(path, buf, sizeof(buf));
if (ret & (~NP2FLAG_DISKCHG)) {	if (ret & (~STATFLAG_DISKCHG)) {
MessageBox(hWndMain, "Couldn't restart", title, MB_OK \| MB_ICONSTOP);	MessageBox(hWndMain, "Couldn't restart", title, MB_OK \| MB_ICONSTOP);
id = IDNO;	id = IDNO;
}	}
else if ((!force) && (ret & NP2FLAG_DISKCHG)) {	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
char buf2[1024 + 256];	char buf2[1024 + 256];
wsprintf(buf2, "Conflict!\n\n%s\nContinue?", buf);	wsprintf(buf2, "Conflict!\n\n%s\nContinue?", buf);
id = MessageBox(hWndMain, buf2, title,	id = MessageBox(hWndMain, buf2, title,
Line 395 static void np2cmd(HWND hWnd, UINT16 cmd	Line 399 static void np2cmd(HWND hWnd, UINT16 cmd
toolwin_setfdd(1, NULL);	toolwin_setfdd(1, NULL);
break;	break;

	case IDM_FDD3OPEN:
	winuienter();
	dialog_changefdd(hWnd, 2);
	winuileave();
	break;

	case IDM_FDD3EJECT:
	diskdrv_setfdd(2, NULL, 0);
	toolwin_setfdd(2, NULL);
	break;

	case IDM_FDD4OPEN:
	winuienter();
	dialog_changefdd(hWnd, 3);
	winuileave();
	break;

	case IDM_FDD4EJECT:
	diskdrv_setfdd(3, NULL, 0);
	toolwin_setfdd(3, NULL);
	break;

case IDM_SASI1OPEN:	case IDM_SASI1OPEN:
winuienter();	winuienter();
dialog_changehdd(hWnd, 0x00);	dialog_changehdd(hWnd, 0x00);
Line 750 static void np2cmd(HWND hWnd, UINT16 cmd	Line 776 static void np2cmd(HWND hWnd, UINT16 cmd
dialog_writebmp(hWnd);	dialog_writebmp(hWnd);
winuileave();	winuileave();
break;	break;
	#if defined(SUPPPORT_S98)
case IDM_S98LOGGING:	case IDM_S98LOGGING:
winuienter();	winuienter();
dialog_s98(hWnd);	dialog_s98(hWnd);
winuileave();	winuileave();
break;	break;
	#endif
	#if defined(SUPPORT_WAVEREC)
	case IDM_WAVEREC:
	winuienter();
	dialog_waverec(hWnd);
	winuileave();
	break;
	#endif
case IDM_DISPCLOCK:	case IDM_DISPCLOCK:
xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);	xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
Line 877 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 910 LRESULT CALLBACK WndProc(HWND hWnd, UINT
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

	#if defined(SUPPORT_KEYDISP)
case IDM_KEYDISP:	case IDM_KEYDISP:
sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);	sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
Line 886 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 920 LRESULT CALLBACK WndProc(HWND hWnd, UINT
kdispwin_destroy();	kdispwin_destroy();
}	}
break;	break;
	#endif
	#if defined(SUPPORT_SOFTKBD)
	case IDM_SOFTKBD:
	skbdwin_create();
	break;
	#endif

case IDM_SCREENCENTER:	case IDM_SCREENCENTER:
if ((!scrnmng_isfullscreen()) &&	if ((!scrnmng_isfullscreen()) &&
Line 949 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 989 LRESULT CALLBACK WndProc(HWND hWnd, UINT
if (subwin) {	if (subwin) {
ShowWindow(subwin, SW_SHOWNOACTIVATE);	ShowWindow(subwin, SW_SHOWNOACTIVATE);
}	}
	subwin = skbdwin_gethwnd();
	if (subwin) {
	ShowWindow(subwin, SW_SHOWNOACTIVATE);
	}
return(DefWindowProc(hWnd, msg, wParam, lParam));	return(DefWindowProc(hWnd, msg, wParam, lParam));

default:	default:
Line 1317 int WINAPI WinMain(HINSTANCE hInstance,	Line 1361 int WINAPI WinMain(HINSTANCE hInstance,
initload();	initload();
toolwin_readini();	toolwin_readini();
kdispwin_readini();	kdispwin_readini();
	skbdwin_readini();

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

Line 1348 int WINAPI WinMain(HINSTANCE hInstance,	Line 1393 int WINAPI WinMain(HINSTANCE hInstance,
np2oscfg.KEYBOARD = KEY_KEY106;	np2oscfg.KEYBOARD = KEY_KEY106;
}	}
}	}
keystat_reset();	keystat_initialize();

np2class_initialize(hInstance);	np2class_initialize(hInstance);
if (!hPreInst) {	if (!hPreInst) {
Line 1368 int WINAPI WinMain(HINSTANCE hInstance,	Line 1413 int WINAPI WinMain(HINSTANCE hInstance,
}	}
toolwin_initapp(hInstance);	toolwin_initapp(hInstance);
kdispwin_initialize(hPreInst);	kdispwin_initialize(hPreInst);
	skbdwin_initialize(hPreInst);
viewer_init(hPreInst);	viewer_init(hPreInst);

mousemng_initialize();	mousemng_initialize();
Line 1610 int WINAPI WinMain(HINSTANCE hInstance,	Line 1656 int WINAPI WinMain(HINSTANCE hInstance,
}	}
toolwin_destroy();	toolwin_destroy();
kdispwin_destroy();	kdispwin_destroy();
	skbdwin_destroy();

pccore_cfgupdate();	pccore_cfgupdate();

Line 1639 int WINAPI WinMain(HINSTANCE hInstance,	Line 1686 int WINAPI WinMain(HINSTANCE hInstance,
initsave();	initsave();
toolwin_writeini();	toolwin_writeini();
kdispwin_writeini();	kdispwin_writeini();
	skbdwin_writeini();
}	}
	skbdwin_deinitialize();

TRACETERM();	TRACETERM();
_MEM_USED("report.txt");	_MEM_USED("report.txt");

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

Removed from v.1.39
changed lines
	Added in v.1.47