--- np2/win9x/scrnmng.cpp	2003/12/01 03:38:52	1.13
+++ np2/win9x/scrnmng.cpp	2005/02/07 14:46:14	1.19
@@ -28,16 +28,16 @@ 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;
-	BYTE				menudisp;
+	UINT8				r16b;
+	UINT8				l16r;
+	UINT8				l16g;
+	UINT8				menudisp;
 	int					menusize;
 	RECT				scrn;
 	RECT				rect;
@@ -297,14 +297,14 @@ static void paletteset(void) {
 
 static void make16mask(DWORD bmask, DWORD rmask, DWORD gmask) {
 
-	BYTE	sft;
+	UINT8	sft;
 
 	sft = 0;
 	while((!(bmask & 0x80)) && (sft < 32)) {
 		bmask <<= 1;
 		sft++;
 	}
-	ddraw.pal16mask.p.b = (BYTE)bmask;
+	ddraw.pal16mask.p.b = (UINT8)bmask;
 	ddraw.r16b = sft;
 
 	sft = 0;
@@ -312,7 +312,7 @@ static void make16mask(DWORD bmask, DWOR
 		rmask >>= 1;
 		sft++;
 	}
-	ddraw.pal16mask.p.r = (BYTE)rmask;
+	ddraw.pal16mask.p.r = (UINT8)rmask;
 	ddraw.l16r = sft;
 
 	sft = 0;
@@ -320,7 +320,7 @@ static void make16mask(DWORD bmask, DWOR
 		gmask >>= 1;
 		sft++;
 	}
-	ddraw.pal16mask.p.g = (BYTE)gmask;
+	ddraw.pal16mask.p.g = (UINT8)gmask;
 	ddraw.l16g = sft;
 }
 
@@ -336,7 +336,7 @@ void scrnmng_initialize(void) {
 	setwindowsize(hWndMain, 640, 400);
 }
 
-BOOL scrnmng_create(BYTE scrnmode) {
+BOOL scrnmng_create(UINT8 scrnmode) {
 
 	DWORD			winstyle;
 	DWORD			winstyleex;
@@ -365,7 +365,10 @@ BOOL scrnmng_create(BYTE scrnmode) {
 	}
 	else {
 		scrnmng.flag = SCRNFLAG_HAVEEXTEND;
-		winstyle |= WS_SYSMENU | WS_THICKFRAME;
+		winstyle |= WS_SYSMENU;
+		if (np2oscfg.thickframe) {
+			winstyle |= WS_THICKFRAME;
+		}
 		if (np2oscfg.wintype < 2) {
 			winstyle |= WS_CAPTION;
 		}
@@ -385,15 +388,14 @@ 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;
+#if !defined(SUPPORT_PC9821)
 		bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8;
+#else
+		bitcolor = 16;
+#endif
 		if (ddraw2->SetDisplayMode(640, height, bitcolor, 0, 0) != DD_OK) {
 			goto scre_err;
 		}
@@ -429,8 +431,7 @@ BOOL scrnmng_create(BYTE scrnmode) {
 			dclock_init8();
 		}
 		else {
-			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask,
-														ddpf.dwGBitMask);
+			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
 			dclock_init16();
 		}
 
@@ -483,7 +484,11 @@ BOOL scrnmng_create(BYTE scrnmode) {
 		}
 		bitcolor = ddpf.dwRGBBitCount;
 		if (bitcolor == 8) {
+#if !defined(SUPPORT_PC9821)
 			paletteinit();
+#else
+			goto scre_err;
+#endif
 		}
 		else if (bitcolor == 16) {
 			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
@@ -497,7 +502,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;
@@ -569,7 +574,7 @@ RGB16 scrnmng_makepal16(RGB32 pal32) {
 
 void scrnmng_fullscrnmenu(int y) {
 
-	BYTE	menudisp;
+	UINT8	menudisp;
 
 	if (scrnmng.flag & SCRNFLAG_FULLSCREEN) {
 		menudisp = ((y >= 0) && (y < ddraw.menusize))?1:0;
@@ -662,18 +667,18 @@ const SCRNSURF *scrnmng_surflock(void) {
 		return(NULL);
 	}
 	if (!(ddraw.scrnmode & SCRNMODE_ROTATE)) {
-		scrnsurf.ptr = (BYTE *)destscrn.lpSurface;
+		scrnsurf.ptr = (UINT8 *)destscrn.lpSurface;
 		scrnsurf.xalign = scrnsurf.bpp >> 3;
 		scrnsurf.yalign = destscrn.lPitch;
 	}
 	else if (!(ddraw.scrnmode & SCRNMODE_ROTATEDIR)) {
-		scrnsurf.ptr = (BYTE *)destscrn.lpSurface;
+		scrnsurf.ptr = (UINT8 *)destscrn.lpSurface;
 		scrnsurf.ptr += (scrnsurf.width - 1) * destscrn.lPitch;
 		scrnsurf.xalign = 0 - destscrn.lPitch;
 		scrnsurf.yalign = scrnsurf.bpp >> 3;
 	}
 	else {
-		scrnsurf.ptr = (BYTE *)destscrn.lpSurface;
+		scrnsurf.ptr = (UINT8 *)destscrn.lpSurface;
 		scrnsurf.ptr += (scrnsurf.height - 1) * (scrnsurf.bpp >> 3);
 		scrnsurf.xalign = destscrn.lPitch;
 		scrnsurf.yalign = 0 - (scrnsurf.bpp >> 3);
@@ -768,7 +773,7 @@ void scrnmng_dispclock(void) {
 			ddraw.clocksurf->Unlock(NULL);
 		}
 		if (ddraw.primsurf->BltFast(640 - DCLOCK_X - 4,
-									ddraw.height - DCLOCK_Y, 
+									ddraw.height - DCLOCK_Y,
 									ddraw.clocksurf, (RECT *)&rectclk,
 									DDBLTFAST_WAIT) == DDERR_SURFACELOST) {
 			ddraw.primsurf->Restore();