--- np2/win9x/np2.cpp 2003/12/25 03:02:40 1.33 +++ np2/win9x/np2.cpp 2004/01/22 01:10:05 1.35 @@ -43,7 +43,6 @@ #include "diskdrv.h" #include "fddfile.h" #include "timing.h" -#include "statsave.h" #include "debugsub.h" #include "keydisp.h" #include "kdispwin.h" @@ -66,7 +65,7 @@ static char szClassName[] = "NP2-MainWi NP2OSCFG np2oscfg = { "Neko Project II", "NP2", - CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 2, + CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 0, 0, 0, KEY_UNKNOWN, 0, 0, 0, 0, {1, 2, 2, 1}, {5, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34 @@ -319,6 +318,8 @@ static void np2popup(HWND hWnd, LPARAM l DestroyMenu(hMenu); } +// extern "C" void iptrace_out(void); + LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { PAINTSTRUCT ps; @@ -504,22 +505,22 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case IDM_SASI1OPEN: winuienter(); - dialog_changehdd(hWnd, 0); + dialog_changehdd(hWnd, 0x00); winuileave(); break; case IDM_SASI1EJECT: - diskdrv_sethdd(0, NULL); + diskdrv_sethdd(0x00, NULL); break; case IDM_SASI2OPEN: winuienter(); - dialog_changehdd(hWnd, 1); + dialog_changehdd(hWnd, 0x01); winuileave(); break; case IDM_SASI2EJECT: - diskdrv_sethdd(1, NULL); + diskdrv_sethdd(0x01, NULL); break; case IDM_WINDOW: @@ -861,6 +862,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case IDM_I286SAVE: debugsub_status(); +// iptrace_out(); break; case IDM_HELP: @@ -1306,13 +1308,23 @@ int WINAPI WinMain(HINSTANCE hInstance, } toolwin_initapp(hInstance); kdispwin_initialize(hPreInst); - viewer_init(hPreInst); // ver0.30 + viewer_init(hPreInst); - hWndMain = CreateWindow(szClassName, np2oscfg.titles, +#if 1 + hWndMain = CreateWindowEx(0, + szClassName, np2oscfg.titles, WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX, np2oscfg.winx, np2oscfg.winy, 640, 400, NULL, NULL, hInstance, NULL); +#else // ¥Æ¥¹¥È + hWndMain = CreateWindowEx(0, + szClassName, np2oscfg.titles, + WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION | + WS_MINIMIZEBOX, + np2oscfg.winx, np2oscfg.winy, 640, 400, + NULL, NULL, hInstance, NULL); +#endif hWnd = hWndMain; scrnmng_initialize();