xmil/win9x/xmil.cpp - diff

Return to xmil.cpp CVS log

Up to [RetroPC.NET] / xmil / win9x

Diff for /xmil/win9x/xmil.cpp between versions 1.17 and 1.22

version 1.17, 2004/08/12 18:22:54	version 1.22, 2004/08/18 11:46:57
Line 10	Line 10
#include "scrnmng.h"	#include "scrnmng.h"
#include "soundmng.h"	#include "soundmng.h"
#include "sysmng.h"	#include "sysmng.h"
#include "ddrawbmp.h"
#include "winloc.h"	#include "winloc.h"
#include "dclock.h"	#include "dclock.h"
#include "winkbd.h"	#include "winkbd.h"
Line 101 static void winuileave(void) {	Line 100 static void winuileave(void) {
static void dispbmp(HINSTANCE hinst, HDC hdc,	static void dispbmp(HINSTANCE hinst, HDC hdc,
const OEMCHAR *res, int x, int y) {	const OEMCHAR *res, int x, int y) {

HBITMAP hbmp;	HBITMAP hbmp;
BITMAP bmp;	BITMAP bmp;
HDC hmdc;	HDC hmdc;

hbmp = LoadBitmap(hinst, res);	hbmp = LoadBitmap(hinst, res);
GetObject(hbmp, sizeof(bmp), &bmp);	GetObject(hbmp, sizeof(bmp), &bmp);
Line 117 static void dispbmp(HINSTANCE hinst, HDC	Line 116 static void dispbmp(HINSTANCE hinst, HDC

// ----	// ----

#if defined(SUPPORT_RESUME) \|\| defined(SUPPORT_STATSAVE)	#if defined(SUPPORT_RESUME)
static const OEMCHAR xmilresumeext[] = OEMTEXT(".sav");	static const OEMCHAR xmilresumeext[] = OEMTEXT(".sav");
	static const OEMCHAR str_resume[] = OEMTEXT("Resume");
#endif	#endif
#if defined(SUPPORT_STATSAVE)	#if defined(SUPPORT_STATSAVE)
static const OEMCHAR xmilflagext[] = OEMTEXT(".sv%u");	static const OEMCHAR xmilflagext[] = OEMTEXT(".sv%u");
Line 126 static const OEMCHAR str_statload[] = OE	Line 126 static const OEMCHAR str_statload[] = OE
#endif	#endif

#if defined(SUPPORT_RESUME) \|\| defined(SUPPORT_STATSAVE)	#if defined(SUPPORT_RESUME) \|\| defined(SUPPORT_STATSAVE)

static const OEMCHAR str_loaderr[] = OEMTEXT("Couldn't restart");	static const OEMCHAR str_loaderr[] = OEMTEXT("Couldn't restart");
static const OEMCHAR str_conflict[] = OEMTEXT("Conflict!\n\n%s\nContinue?");	static const OEMCHAR str_conflict[] = OEMTEXT("Conflict!\n\n%s\nContinue?");

Line 160 static void flagdelete(const OEMCHAR *ex	Line 159 static void flagdelete(const OEMCHAR *ex
file_delete(path);	file_delete(path);
}	}

static int flagload(const OEMCHAR ext, const OEMCHAR title, BOOL force) {	static int flagload(const OEMCHAR ext, const OEMCHAR title, BRESULT force) {

int ret;	int ret;
int id;	int id;
Line 199 static int flagload(const OEMCHAR *ext,	Line 198 static int flagload(const OEMCHAR *ext,
static void xmilcmd(HWND hWnd, UINT cmd) {	static void xmilcmd(HWND hWnd, UINT cmd) {

UINT update;	UINT update;
	#if defined(SUPPORT_STATSAVE)
OEMCHAR ext[16];	OEMCHAR ext[16];
	#endif

update = 0;	update = 0;
switch(cmd) {	switch(cmd) {
Line 248 static void xmilcmd(HWND hWnd, UINT cmd)	Line 249 static void xmilcmd(HWND hWnd, UINT cmd)
diskdrv_setfdd(1, NULL, 0);	diskdrv_setfdd(1, NULL, 0);
break;	break;

case IDM_TURBOZ:	case IDM_FDD2OPEN:
menu_setiplrom(3);	winuienter();
	dialog_changefdd(hWnd, 2);
	winuileave();
	break;

	case IDM_FDD2EJECT:
	diskdrv_setfdd(2, NULL, 0);
	break;

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

	case IDM_FDD3EJECT:
	diskdrv_setfdd(3, NULL, 0);
	break;

	case IDM_X1ROM:
	menu_setiplrom(1);
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
break;	break;

Line 258 static void xmilcmd(HWND hWnd, UINT cmd)	Line 279 static void xmilcmd(HWND hWnd, UINT cmd)
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
break;	break;

case IDM_X1ROM:	#if defined(SUPPORT_TURBOZ)
menu_setiplrom(1);	case IDM_TURBOZ:
	menu_setiplrom(3);
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
break;	break;
	#endif

case IDM_BOOT2D:	case IDM_BOOT2D:
menu_setbootmedia(0);	menu_setbootmedia(0);
Line 291 static void xmilcmd(HWND hWnd, UINT cmd)	Line 314 static void xmilcmd(HWND hWnd, UINT cmd)
scrnmng_changescreen(scrnmode \| SCRNMODE_FULLSCREEN);	scrnmng_changescreen(scrnmode \| SCRNMODE_FULLSCREEN);
break;	break;

case IDM_WIDTH80:
crtc_forcesetwidth(80);
break;

case IDM_WIDTH40:
crtc_forcesetwidth(40);
break;

case IDM_DISPSYNC:	case IDM_DISPSYNC:
menu_setdispmode(xmilcfg.DISPSYNC ^ 1);	menu_setdispmode(xmilcfg.DISPSYNC ^ 1);
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
Line 306 static void xmilcmd(HWND hWnd, UINT cmd)	Line 321 static void xmilcmd(HWND hWnd, UINT cmd)

case IDM_RASTER:	case IDM_RASTER:
menu_setraster(xmilcfg.RASTER ^ 1);	menu_setraster(xmilcfg.RASTER ^ 1);
	if (xmilcfg.RASTER) {
	scrnmng_changescreen(scrnmode \| SCRNMODE_SYSHIGHCOLOR);
	}
	else {
	scrnmng_changescreen(scrnmode & (~SCRNMODE_SYSHIGHCOLOR));
	}
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
break;	break;

Line 372 static void xmilcmd(HWND hWnd, UINT cmd)	Line 393 static void xmilcmd(HWND hWnd, UINT cmd)
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
break;	break;

	case IDM_WIDTH40:
	crtc_forcesetwidth(40);
	break;

	case IDM_WIDTH80:
	crtc_forcesetwidth(80);
	break;

	case IDM_Z80SAVE:
	debugsub_status();
	break;

case IDM_BMPSAVE:	case IDM_BMPSAVE:
winuienter();	winuienter();
bmpsave();	dialog_writebmp(hWnd);
winuileave();	winuileave();
break;	break;

Line 404 static void xmilcmd(HWND hWnd, UINT cmd)	Line 437 static void xmilcmd(HWND hWnd, UINT cmd)
update = SYS_UPDATECFG;	update = SYS_UPDATECFG;
break;	break;

case IDM_Z80SAVE:
debugsub_status();
break;

case IDM_ABOUT:	case IDM_ABOUT:
winuienter();	winuienter();
DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT),	DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT),
Line 835 int WINAPI WinMain(HINSTANCE hInstance,	Line 864 int WINAPI WinMain(HINSTANCE hInstance,

scrndraw_initialize();	scrndraw_initialize();
scrnmode = 0;	scrnmode = 0;
	if (xmilcfg.RASTER) {
	scrnmode \|= SCRNMODE_SYSHIGHCOLOR;
	}
if (scrnmng_create(scrnmode) != SUCCESS) {	if (scrnmng_create(scrnmode) != SUCCESS) {
scrnmode ^= SCRNMODE_FULLSCREEN;	scrnmode ^= SCRNMODE_FULLSCREEN;
if (scrnmng_create(scrnmode) != SUCCESS) {	if (scrnmng_create(scrnmode) != SUCCESS) {

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

Removed from v.1.17
changed lines
	Added in v.1.22