From 4247b60d228dfa134aad25fa73317b38d15bed95 Mon Sep 17 00:00:00 2001 From: yui Date: Sun, 13 Feb 2005 22:27:54 +0000 Subject: [PATCH] fix... --- defrom.res | 51 --------------------------------------- embed/menubase/menuicon.c | 2 +- embed/menubase/menures.c | 4 +-- io/fdc.c | 2 +- io/fdc.h | 2 +- macos9/sysmng.cpp | 3 ++- macos9/xmil.cpp | 4 ++- vram/makescrn.c | 4 +-- win9x/dialog/d_about.cpp | 4 +-- win9x/fontmng.cpp | 8 +++--- wince/xmil.cpp | 2 ++ xmilver.h | 3 ++- 12 files changed, 21 insertions(+), 68 deletions(-) delete mode 100644 defrom.res diff --git a/defrom.res b/defrom.res deleted file mode 100644 index ad43df5..0000000 --- a/defrom.res +++ /dev/null @@ -1,51 +0,0 @@ - -static const UINT8 DEFROM[575] = { - 0x31,0x00,0x00,0xCD,0x42,0x00,0xCD,0x69,0x00,0x11,0xF6,0x01, - 0xCD,0x81,0x00,0xCD,0xCA,0x00,0x11,0x1D,0x02,0xCD,0x81,0x00, - 0xCD,0xE3,0x00,0x38,0x0D,0xCD,0x11,0x01,0xCD,0x92,0x01,0x20, - 0x0A,0xCD,0xBA,0x01,0x18,0xFE,0x11,0x0E,0x02,0x18,0x08,0x11, - 0xA9,0x01,0x18,0x03,0x11,0x34,0x02,0xCD,0x81,0x00,0x01,0xFC, - 0x0F,0xAF,0xED,0x79,0x18,0xFE,0x21,0x00,0x00,0x22,0x80,0xFF, - 0x3E,0x07,0x32,0x86,0xFF,0x21,0x34,0x00,0x22,0x8A,0xFF,0xAF, - 0x32,0x87,0xFF,0x01,0x00,0x18,0x3E,0x01,0xED,0x79,0x0C,0x3E, - 0x28,0xED,0x79,0xC9,0x00,0x00,0xC3,0x00,0x00,0x01,0x00,0x20, - 0x26,0x07,0xCD,0x75,0x00,0x06,0x30,0x26,0x20,0x11,0x00,0x08, - 0xED,0x61,0x03,0x1B,0x7A,0xB3,0x20,0xF8,0xC9,0x1A,0xB7,0xC8, - 0xCD,0x8A,0x00,0x13,0x18,0xF7,0x2A,0x80,0xFF,0xFE,0x20,0x38, - 0x15,0xC5,0xCD,0xB2,0x00,0xF5,0x3A,0x86,0xFF,0xED,0x79,0xCB, - 0xE0,0xF1,0xED,0x79,0x2C,0x22,0x80,0xFF,0xC1,0xC9,0xFE,0x0D, - 0x28,0x01,0xC9,0x2E,0x00,0x24,0x22,0x80,0xFF,0xC9,0xD5,0xE5, - 0xD1,0x6C,0x26,0x00,0xE5,0xC1,0x29,0x29,0x09,0x29,0x29,0x29, - 0x4B,0x06,0x20,0x09,0xE5,0xC1,0xD5,0xE1,0xD1,0xC9,0x01,0x02, - 0x1A,0x3E,0x60,0xED,0x79,0x3E,0x40,0xED,0x79,0x01,0x00,0x00, - 0x26,0x00,0x11,0x00,0x40,0xCD,0x78,0x00,0xED,0x78,0xC9,0x01, - 0xFC,0x0F,0x3E,0x80,0xED,0x79,0x0E,0xF8,0x16,0x04,0x21,0x00, - 0x00,0xED,0x78,0xF2,0x00,0x01,0x2B,0x7D,0xB4,0x20,0xF6,0x15, - 0x20,0xF3,0x37,0xC9,0xA7,0xC9,0xCD,0x07,0x01,0xED,0x79,0xF5, - 0x0E,0xF8,0xED,0x78,0x0F,0x38,0xFB,0xF1,0xC9,0x11,0x00,0x00, - 0x21,0x00,0xFE,0x3E,0x01,0x08,0x7B,0x07,0xCB,0x12,0x07,0xCB, - 0x12,0x07,0xCB,0x12,0x07,0xCB,0x12,0x7B,0xE6,0x0F,0x5F,0x3A, - 0x87,0xFF,0xE6,0x0F,0xF6,0x80,0xCB,0x42,0x28,0x02,0xF6,0x10, - 0x01,0xFC,0x0F,0xED,0x79,0x7A,0xCB,0x3F,0x0E,0xFB,0xED,0x79, - 0x3E,0x10,0xCD,0x02,0x01,0x1C,0x0E,0xFA,0xED,0x59,0x0E,0xF8, - 0xED,0x78,0xE6,0x98,0x28,0x08,0xCD,0x88,0x01,0x2A,0x8A,0xFF, - 0xE3,0xC9,0x3E,0x80,0xED,0x79,0x0E,0xF8,0xED,0x78,0x0F,0x30, - 0x0B,0x0F,0x30,0xF6,0x0E,0xFB,0xED,0x78,0x77,0x23,0x18,0xEE, - 0x08,0x3D,0x28,0x0B,0x08,0x7B,0xFE,0x10,0x38,0xCB,0x14,0x1E, - 0x00,0x18,0xA8,0x3E,0x02,0xCD,0x02,0x01,0x3A,0x87,0xFF,0xE6, - 0x0F,0x0E,0xFC,0xED,0x79,0xC9,0x21,0x00,0xFE,0x7E,0xFE,0x01, - 0xC0,0x2E,0x0E,0x7E,0xFE,0x53,0xC0,0x23,0x7E,0xFE,0x79,0xC0, - 0x23,0x7E,0xFE,0x73,0xC9,0x4E,0x6F,0x20,0x73,0x79,0x73,0x74, - 0x65,0x6D,0x20,0x66,0x69,0x6C,0x65,0x73,0x21,0x00,0x21,0x00, - 0xFE,0x11,0x00,0xFF,0x01,0x20,0x00,0xED,0xB0,0x15,0x1E,0x0E, - 0xAF,0x12,0x1E,0x01,0xCD,0x81,0x00,0x2A,0x12,0xFF,0x2B,0x24, - 0x7C,0x2A,0x14,0xFF,0xED,0x5B,0x1E,0xFF,0xCD,0x19,0x01,0x21, - 0xF0,0x01,0x11,0x78,0xFF,0x01,0x06,0x00,0xED,0xB0,0x2A,0x16, - 0xFF,0xC3,0x78,0xFF,0x01,0x00,0x1E,0xED,0x79,0xE9,0x58,0x31, - 0x45,0x4D,0x55,0x20,0x49,0x50,0x4C,0x20,0x76,0x65,0x72,0x73, - 0x69,0x6F,0x6E,0x20,0x31,0x2E,0x30,0x31,0x0D,0x00,0x6E,0x6F, - 0x74,0x20,0x66,0x6F,0x75,0x6E,0x64,0x21,0x00,0x00,0xC3,0x19, - 0x01,0x53,0x65,0x61,0x72,0x63,0x68,0x69,0x6E,0x67,0x20,0x46, - 0x44,0x20,0x69,0x6D,0x61,0x67,0x65,0x73,0x2E,0x2E,0x2E,0x00, - 0x46,0x44,0x43,0x20,0x65,0x72,0x72,0x6F,0x72,0x21,0x00}; - diff --git a/embed/menubase/menuicon.c b/embed/menubase/menuicon.c index b6ffabf..b7f3ef8 100644 --- a/embed/menubase/menuicon.c +++ b/embed/menubase/menuicon.c @@ -92,7 +92,7 @@ static const UINT8 icon24c[200] = { // 32x32 0xe7,0xf1,0x11,0x31,0x4a,0x2e,0x11,0x31,0x09,0x00,0x46,0x2e,0x11, 0xc0,0x00,0x7f,0x00,0x3c}; -static const UINT8 icon24cm[106] = { // 32x32 +static const UINT8 icon24cm[106] = { // 32x32 0x06,0x47,0x00,0x00,0x0b,0xff,0xff,0xff,0x03,0xcc,0x00,0x0e,0x07, 0x82,0xff,0x08,0x1b,0x07,0x84,0x08,0x5a,0x07,0xc7,0x08,0x16,0x07, 0x88,0x08,0x16,0x07,0xde,0xff,0x07,0x8a,0x08,0x14,0x07,0xde,0x07, diff --git a/embed/menubase/menures.c b/embed/menubase/menures.c index bc885fe..3b82ba0 100644 --- a/embed/menubase/menures.c +++ b/embed/menubase/menures.c @@ -98,7 +98,7 @@ const MENURES2 menures_close = {8, 8, close1}; // ---- sys -static const UINT8 scheck[7] = { // 8x12 +static const UINT8 scheck[7] = { // 8x12 0x5a,0x41,0x11,0x42,0x63,0xa1,0x04}; static const UINT8 snext[7] = { // 8x12 @@ -109,7 +109,7 @@ const MENURES2 menures_sys[2] = {{8, 12, scheck}, {8, 12, snext}}; // ---- radio -static const UINT8 radio[40] = { // 11x11 +static const UINT8 radio[40] = { // 11x11 0x08,0x47,0x0a,0x44,0x57,0x44,0x07,0x54,0x75,0x51,0x25,0x00,0x54, 0x19,0x23,0x40,0xb5,0x31,0x42,0xb5,0x31,0x42,0xb5,0x31,0x02,0x54, 0x19,0x23,0x00,0x34,0x73,0x31,0x23,0x07,0x22,0x37,0x22,0x0a,0x27, diff --git a/io/fdc.c b/io/fdc.c index c36d69f..6a5f0ce 100644 --- a/io/fdc.c +++ b/io/fdc.c @@ -84,7 +84,7 @@ static REG8 wrtrkstart(FDC *f) { return(0); } -static void wrtrkdata(FDC *f, UINT8 data) { +static void wrtrkdata(FDC *f, REG8 data) { TAOSEC *t; REG8 n; diff --git a/io/fdc.h b/io/fdc.h index 19c78e3..6ba62be 100644 --- a/io/fdc.h +++ b/io/fdc.h @@ -5,7 +5,7 @@ enum { FDCDIR_NONE = 0x00, FDCDIR_TAO = 0x01, FDCDIR_IN = 0x02, - FDCDIR_OUT = 0x03, + FDCDIR_OUT = 0x03 }; enum { diff --git a/macos9/sysmng.cpp b/macos9/sysmng.cpp index d24fa9e..92c4c9a 100644 --- a/macos9/sysmng.cpp +++ b/macos9/sysmng.cpp @@ -83,7 +83,8 @@ void sysmng_updatecaption(BYTE flag) { milstr_ncat(strclock, work, sizeof(strclock)); } } - milstr_ncpy(work, "Nekoe System", sizeof(work)); + milstr_ncpy(work, "X millennium", sizeof(work)); +// milstr_ncpy(work, "Nekoe System", sizeof(work)); milstr_ncat(work, strtitle, sizeof(work)); milstr_ncat(work, strclock, sizeof(work)); diff --git a/macos9/xmil.cpp b/macos9/xmil.cpp index 441df1a..70d94ac 100644 --- a/macos9/xmil.cpp +++ b/macos9/xmil.cpp @@ -640,8 +640,10 @@ int main(int argc, char *argv[]) { // keystat_initialize(); SetRect(&wRect, xmiloscfg.posx, xmiloscfg.posy, 100, 100); - hWndMain = NewWindow(0, &wRect, "\pNekoe System", FALSE, + hWndMain = NewWindow(0, &wRect, "\pX millennium", FALSE, noGrowDocProc, (WindowPtr)-1, TRUE, 0); +// hWndMain = NewWindow(0, &wRect, "\pNekoe System", FALSE, +// noGrowDocProc, (WindowPtr)-1, TRUE, 0); if (!hWndMain) { TRACETERM(); macossub_term(); diff --git a/vram/makescrn.c b/vram/makescrn.c index 9e232ee..db62888 100644 --- a/vram/makescrn.c +++ b/vram/makescrn.c @@ -181,7 +181,7 @@ static void changemodes(void) { if (dispmode & DISPMODE_WIDTH80) { makescrn.drawmode |= 1; } - sysmng_scrnwidth((dispmode & DISPMODE_WIDTH80) == 0); + sysmng_scrnwidth((REG8)((dispmode & DISPMODE_WIDTH80) == 0)); if (!(dispmode & DISPMODE_BANK1)) { makescrn.disp1 = gram + GRAM_BANK0; @@ -391,7 +391,7 @@ void scrnupdate(void) { } if (flag) { - makescrn.nextdraw = scrndraw_draw(flag & SCRNUPD_ALLFLASH); + makescrn.nextdraw = scrndraw_draw((REG8)(flag & SCRNUPD_ALLFLASH)); drawtime++; } } diff --git a/win9x/dialog/d_about.cpp b/win9x/dialog/d_about.cpp index 0f16220..b950c53 100644 --- a/win9x/dialog/d_about.cpp +++ b/win9x/dialog/d_about.cpp @@ -4,8 +4,8 @@ #include "dialog.h" -// static const OEMCHAR str_xmiltitle[] = OEMTEXT("X millennium "); -static const OEMCHAR str_xmiltitle[] = OEMTEXT("ねことィヵの微妙な関係 "); +static const OEMCHAR str_xmiltitle[] = OEMTEXT("X millennium "); +// static const OEMCHAR str_xmiltitle[] = OEMTEXT("ねことィヵの微妙な関係 "); static void about_init(HWND hWnd) { diff --git a/win9x/fontmng.cpp b/win9x/fontmng.cpp index dd77553..bab32d3 100644 --- a/win9x/fontmng.cpp +++ b/win9x/fontmng.cpp @@ -20,8 +20,7 @@ typedef struct { } _FNTMNG, *FNTMNG; -// static const OEMCHAR deffontface[] = OEMTEXT("ＭＳ ゴシック"); -static const OEMCHAR deffontface[] = OEMTEXT("ＤＦ 細丸ゴシック体"); +static const OEMCHAR deffontface[] = OEMTEXT("ＭＳ ゴシック"); static const OEMCHAR deffontface2[] = OEMTEXT("ＭＳ Ｐゴシック"); @@ -36,7 +35,7 @@ void *fontmng_create(int size, UINT type, const OEMCHAR *fontface) { int fontwidth; int fontheight; int weight; - DWORD pitch; + UINT pitch; if (size < 0) { size *= -1; @@ -211,7 +210,6 @@ BRESULT fontmng_getdrawsize(void *hdl, const OEMCHAR *string, POINT_T *pt) { width = 0; posx = 0; - buf[2] = '\0'; while(1) { leng = milstr_charsize(string); if (!leng) { @@ -223,7 +221,7 @@ BRESULT fontmng_getdrawsize(void *hdl, const OEMCHAR *string, POINT_T *pt) { getlength1((FNTMNG)hdl, &fdat, buf, leng); width = posx + max(fdat.width, fdat.pitch); posx += fdat.pitch; - } while(1); + } if (pt) { pt->x = width; diff --git a/wince/xmil.cpp b/wince/xmil.cpp index 8535059..54ae94c 100644 --- a/wince/xmil.cpp +++ b/wince/xmil.cpp @@ -555,11 +555,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst, return(msg.wParam); +#if defined(SUPPORT_RESUME) np2main_err4: pccore_deinitialize(); x1f_close(); soundmng_deinitialize(); GXCloseInput(); +#endif np2main_err3: scrnmng_destroy(); diff --git a/xmilver.h b/xmilver.h index 54c691d..6873662 100644 --- a/xmilver.h +++ b/xmilver.h @@ -1,5 +1,6 @@ -#define XMILVER_CORE "ver.0.50" +// #define XMILVER_CORE "ver.0.50" +#define XMILVER_CORE "05/02/14" // #define XMILVER_WIN9X // #define XMILVER_MACOS9