--- np2/win9x/scrnmng.cpp	2003/11/04 19:23:03	1.10
+++ np2/win9x/scrnmng.cpp	2004/02/13 20:31:55	1.15
@@ -28,15 +28,15 @@ typedef struct {
 	LPDIRECTDRAWSURFACE	clocksurf;
 	LPDIRECTDRAWCLIPPER	clipper;
 	LPDIRECTDRAWPALETTE	palette;
-	BYTE				scrnmode;
+	UINT				scrnmode;
 	int					width;
 	int					height;
 	int					extend;
 	int					cliping;
 	RGB32				pal16mask;
-	BYTE				r16b;
-	BYTE				l16r;
-	BYTE				l16g;
+	UINT8				r16b;
+	UINT8				l16r;
+	UINT8				l16g;
 	BYTE				menudisp;
 	int					menusize;
 	RECT				scrn;
@@ -385,13 +385,8 @@ BOOL scrnmng_create(BYTE scrnmode) {
 
 	if (scrnmode & SCRNMODE_FULLSCREEN) {
 		dclock_init();
-#if 1
 		ddraw2->SetCooperativeLevel(hWndMain,
 										DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
-#else
-		ddraw2->SetCooperativeLevel(hWndMain,
-					DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT);
-#endif
 		height = (np2oscfg.force400)?400:480;
 		bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8;
 		if (ddraw2->SetDisplayMode(640, height, bitcolor, 0, 0) != DD_OK) {
@@ -497,7 +492,7 @@ BOOL scrnmng_create(BYTE scrnmode) {
 		}
 		ddraw.extend = 1;
 	}
-	scrnmng.bpp = (BYTE)bitcolor;
+	scrnmng.bpp = (UINT8)bitcolor;
 	scrnsurf.bpp = bitcolor;
 	ddraw.scrnmode = scrnmode;
 	ddraw.width = 640;
@@ -614,6 +609,12 @@ void scrnmng_clearwinui(void) {
 		clearoutfullscreen();
 		ddraw.menudisp = 0;
 	}
+	else {
+		if (np2oscfg.wintype) {
+			np2class_enablemenu(hWndMain, FALSE);
+			InvalidateRect(hWndMain, NULL, TRUE);
+		}
+	}
 	mousemng_enable(MOUSEPROC_WINUI);
 }
 
@@ -626,6 +627,7 @@ void scrnmng_setwidth(int posx, int widt
 void scrnmng_setextend(int extend) {
 
 	scrnstat.extend = extend;
+	scrnmng.allflash = TRUE;
 	renewalclientsize(TRUE);
 }