--- xmil/win9x/xmil.cpp 2004/08/12 18:22:54 1.17 +++ xmil/win9x/xmil.cpp 2004/08/13 06:49:31 1.19 @@ -101,9 +101,9 @@ static void winuileave(void) { static void dispbmp(HINSTANCE hinst, HDC hdc, const OEMCHAR *res, int x, int y) { - HBITMAP hbmp; - BITMAP bmp; - HDC hmdc; + HBITMAP hbmp; + BITMAP bmp; + HDC hmdc; hbmp = LoadBitmap(hinst, res); GetObject(hbmp, sizeof(bmp), &bmp); @@ -117,8 +117,9 @@ 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 str_resume[] = OEMTEXT("Resume"); #endif #if defined(SUPPORT_STATSAVE) static const OEMCHAR xmilflagext[] = OEMTEXT(".sv%u"); @@ -126,7 +127,6 @@ static const OEMCHAR str_statload[] = OE #endif #if defined(SUPPORT_RESUME) || defined(SUPPORT_STATSAVE) - static const OEMCHAR str_loaderr[] = OEMTEXT("Couldn't restart"); static const OEMCHAR str_conflict[] = OEMTEXT("Conflict!\n\n%s\nContinue?"); @@ -160,7 +160,7 @@ static void flagdelete(const OEMCHAR *ex 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 id; @@ -199,7 +199,9 @@ static int flagload(const OEMCHAR *ext, static void xmilcmd(HWND hWnd, UINT cmd) { UINT update; +#if defined(SUPPORT_STATSAVE) OEMCHAR ext[16]; +#endif update = 0; switch(cmd) { @@ -248,6 +250,26 @@ static void xmilcmd(HWND hWnd, UINT cmd) diskdrv_setfdd(1, NULL, 0); break; + case IDM_FDD2OPEN: + 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_TURBOZ: menu_setiplrom(3); update = SYS_UPDATECFG;