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.1.1.1 and 1.8

version 1.1.1.1, 2003/10/16 17:58:56	version 1.8, 2003/10/23 12:58:44
Line 1	Line 1
#include "compiler.h"	#include "compiler.h"
#include <time.h>	#include <time.h>
	#ifndef __GNUC__
#include <winnls32.h>	#include <winnls32.h>
	#endif
#include "resource.h"	#include "resource.h"
#include "strres.h"	#include "strres.h"
#include "np2.h"	#include "np2.h"
Line 16	Line 18
#include "winkbd.h"	#include "winkbd.h"
#include "ini.h"	#include "ini.h"
#include "menu.h"	#include "menu.h"
#include "dialog.h"
#include "winloc.h"	#include "winloc.h"
#include "sstp.h"	#include "sstp.h"
#include "sstpmsg.h"	#include "sstpmsg.h"
#include "dclock.h"	#include "dclock.h"
	#ifdef USE_ROMEO
	#include "juliet.h"
	#endif
	#include "dialog.h"
#include "memory.h"	#include "memory.h"
#include "pccore.h"	#include "pccore.h"
#include "iocore.h"	#include "iocore.h"
#include "pc9861k.h"	#include "pc9861k.h"
#include "mpu98ii.h"	#include "mpu98ii.h"
#include "timing.h"
#include "debugsub.h"
#include "bios.h"	#include "bios.h"
#include "scrndraw.h"	#include "scrndraw.h"
#include "sound.h"	#include "sound.h"
Line 35	Line 38
#include "s98.h"	#include "s98.h"
#include "diskdrv.h"	#include "diskdrv.h"
#include "fddfile.h"	#include "fddfile.h"
	#include "timing.h"
#ifdef USE_ROMEO	#include "statsave.h"
#include "juliet.h"	#include "debugsub.h"
#endif

#include "keydisp.h"	#include "keydisp.h"
#include "viewer.h"	#include "viewer.h"
#include "statsave.h"


#ifdef BETA_RELEASE	#ifdef BETA_RELEASE
Line 51	Line 51

#define STATSAVEMAX 10	#define STATSAVEMAX 10

static char np2help[] = "np2.hlp";
static char np2resume[] = "sav";

static char szClassName[] = "NP2-MainWindow";	static char szClassName[] = "NP2-MainWindow";
HWND hWndMain;	HWND hWndMain;
HINSTANCE hInst;	HINSTANCE hInst;
Line 86 static int np2opening = 1;	Line 83 static int np2opening = 1;
static int np2quitmsg = 0;	static int np2quitmsg = 0;
HMENU hStat = NULL;	HMENU hStat = NULL;

	static const char np2help[] = "np2.hlp";
	static const char np2resume[] = "sav";


typedef struct {	typedef struct {
const char *str;	const char *str;
Line 275 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 275 LRESULT CALLBACK WndProc(HWND hWnd, UINT
switch (msg) {	switch (msg) {
case WM_CREATE:	case WM_CREATE:
sstp_construct(hWnd);	sstp_construct(hWnd);
	#ifndef __GNUC__
WINNLSEnableIME(hWnd, FALSE);	WINNLSEnableIME(hWnd, FALSE);
	#endif
// DragAcceptFiles(hWnd, TRUE);	// DragAcceptFiles(hWnd, TRUE);
break;	break;

Line 323 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 325 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_SCRNMUL10:	case IDM_SCRNMUL10:
case IDM_SCRNMUL12:	case IDM_SCRNMUL12:
case IDM_SCRNMUL16:	case IDM_SCRNMUL16:
#if 0	if ((!scrnmng_isfullscreen()) &&
if ((SCREENMODE & SCMD_WINDOWED) &&
!(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) {	!(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) {
xmenu_setscrnmul(wParam - IDM_SCRNMUL);	xmenu_setscrnmul(wParam - IDM_SCRNMUL);
ddraws_setmul(wParam - IDM_SCRNMUL);	scrnmng_setmultiple(wParam - IDM_SCRNMUL);
}	}
#endif
break;	break;

default:	default:
Line 810 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 810 LRESULT CALLBACK WndProc(HWND hWnd, UINT
if (LOWORD(wParam) != WA_INACTIVE) {	if (LOWORD(wParam) != WA_INACTIVE) {
np2break &= ~NP2BREAK_MAIN;	np2break &= ~NP2BREAK_MAIN;
scrnmng_update();	scrnmng_update();
	keystat_allrelease();
mouse_running(MOUSE_CONT_M);	mouse_running(MOUSE_CONT_M);
}	}
else {	else {
Line 1079 static void processwait(WORD cnt) {	Line 1080 static void processwait(WORD cnt) {
scrnmng_dispclock();	scrnmng_dispclock();
keydisp_draw(np2oscfg.DRAW_SKIP);	keydisp_draw(np2oscfg.DRAW_SKIP);
viewer_allreload(FALSE);	viewer_allreload(FALSE);
if (np2oscfg.DISPCLK & 2) {	if (np2oscfg.DISPCLK & 3) {
if (sysmng_workclockrenewal()) {	if (sysmng_workclockrenewal()) {
sysmng_updatecaption(2);	sysmng_updatecaption(3);
}	}
}	}
}	}
Line 1097 int WINAPI WinMain(HINSTANCE hInstance,	Line 1098 int WINAPI WinMain(HINSTANCE hInstance,
MSG msg;	MSG msg;
HMENU hMenu;	HMENU hMenu;
HWND hwndorg;	HWND hwndorg;
int i;	UINT i;
#ifdef OPENING_WAIT	#ifdef OPENING_WAIT
UINT32 tick;	UINT32 tick;
#endif	#endif
Line 1105 int WINAPI WinMain(HINSTANCE hInstance,	Line 1106 int WINAPI WinMain(HINSTANCE hInstance,
GetModuleFileName(NULL, modulefile, sizeof(modulefile));	GetModuleFileName(NULL, modulefile, sizeof(modulefile));
dosio_init();	dosio_init();
file_setcd(modulefile);	file_setcd(modulefile);
np2arg_analize(lpszCmdLine); // ��ߥ󥰽�� // ver0.29	np2arg_analize(lpszCmdLine);
initload();	initload();

srand((unsigned)time(NULL));	srand((unsigned)time(NULL));

// np2arg_analize(lpszCmdLine);

CopyMemory(szClassName, np2oscfg.winid, 3);	CopyMemory(szClassName, np2oscfg.winid, 3);

if ((hwndorg = FindWindow(szClassName, NULL)) != NULL) {	if ((hwndorg = FindWindow(szClassName, NULL)) != NULL) {
Line 1369 int WINAPI WinMain(HINSTANCE hInstance,	Line 1368 int WINAPI WinMain(HINSTANCE hInstance,
}	}
else { // auto skip	else { // auto skip
if (!waitcnt) {	if (!waitcnt) {
	UINT cnt;
joy_flash();	joy_flash();
mouse_callback();	mouse_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
dclock_callback();	dclock_callback();
framecnt++;	framecnt++;
if (timing_getcount() < framecnt) {	cnt = timing_getcount();
	if (framecnt > cnt) {
waitcnt = framecnt;	waitcnt = framecnt;
if (framemax > 1) {	if (framemax > 1) {
framemax--;	framemax--;
}	}
}	}
else if (framecnt >= framemax) {	else if (framecnt >= framemax) {
waitcnt = framecnt;
if (framemax < 12) {	if (framemax < 12) {
framemax++;	framemax++;
}	}
	if (cnt >= 12) {
	timing_reset();
	}
	else {
	timing_setcount(cnt - framecnt);
	}
	framecnt = 0;
}	}
}	}
else {	else {

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

Removed from v.1.1.1.1
changed lines
	Added in v.1.8