--- np2/win9x/scrnmng.cpp	2003/10/28 22:05:46	1.7
+++ np2/win9x/scrnmng.cpp	2003/11/01 22:23:04	1.8
@@ -53,58 +53,67 @@ static	SCRNSTAT	scrnstat;
 static	SCRNSURF	scrnsurf;
 
 
-static void setwindowsize(int width, int height) {
+static void setwindowsize(HWND hWnd, int width, int height) {
 
+	RECT	workrc;
+	int		scx;
+	int		scy;
+	UINT	cnt;
 	RECT	rectwindow;
 	RECT	rectclient;
-	RECT	workrc;
-	int		scx, scy;
+	int		cx;
+	int		cy;
 	UINT	update;
 
-	GetWindowRect(hWndMain, &rectwindow);
-	GetClientRect(hWndMain, &rectclient);
-	width += np2oscfg.paddingx * 2;
-	width += rectwindow.right - rectwindow.left;
-	width -= rectclient.right - rectclient.left;
-	height += np2oscfg.paddingy * 2;
-	height += rectwindow.bottom - rectwindow.top;
-	height -= rectclient.bottom - rectclient.top;
-
 	SystemParametersInfo(SPI_GETWORKAREA, 0, &workrc, 0);
 	scx = GetSystemMetrics(SM_CXSCREEN);
 	scy = GetSystemMetrics(SM_CYSCREEN);
 
-	update = 0;
-	if (scx < width) {
-		np2oscfg.winx = (scx - width) / 2;
-		update |= SYS_UPDATEOSCFG;
-	}
-	else {
-		if ((np2oscfg.winx + width) > workrc.right) {
-			np2oscfg.winx = workrc.right - width;
+	cnt = 2;
+	do {
+		GetWindowRect(hWnd, &rectwindow);
+		GetClientRect(hWnd, &rectclient);
+		cx = width;
+		cx += np2oscfg.paddingx * 2;
+		cx += rectwindow.right - rectwindow.left;
+		cx -= rectclient.right - rectclient.left;
+		cy = height;
+		cy += np2oscfg.paddingy * 2;
+		cy += rectwindow.bottom - rectwindow.top;
+		cy -= rectclient.bottom - rectclient.top;
+
+		update = 0;
+		if (scx < cx) {
+			np2oscfg.winx = (scx - cx) / 2;
 			update |= SYS_UPDATEOSCFG;
 		}
-		if (np2oscfg.winx < workrc.left) {
-			np2oscfg.winx = workrc.left;
-			update |= SYS_UPDATEOSCFG;
+		else {
+			if ((np2oscfg.winx + cx) > workrc.right) {
+				np2oscfg.winx = workrc.right - cx;
+				update |= SYS_UPDATEOSCFG;
+			}
+			if (np2oscfg.winx < workrc.left) {
+				np2oscfg.winx = workrc.left;
+				update |= SYS_UPDATEOSCFG;
+			}
 		}
-	}
-	if (scy < height) {
-		np2oscfg.winy = (scy - height) / 2;
-		update |= SYS_UPDATEOSCFG;
-	}
-	else {
-		if ((np2oscfg.winy + height) > workrc.bottom) {
-			np2oscfg.winy = workrc.bottom - height;
+		if (scy < cy) {
+			np2oscfg.winy = (scy - cy) / 2;
 			update |= SYS_UPDATEOSCFG;
 		}
-		if (np2oscfg.winy < workrc.top) {
-			np2oscfg.winy = workrc.top;
-			update |= SYS_UPDATEOSCFG;
+		else {
+			if ((np2oscfg.winy + cy) > workrc.bottom) {
+				np2oscfg.winy = workrc.bottom - cy;
+				update |= SYS_UPDATEOSCFG;
+			}
+			if (np2oscfg.winy < workrc.top) {
+				np2oscfg.winy = workrc.top;
+				update |= SYS_UPDATEOSCFG;
+			}
 		}
-	}
-	sysmng_update(update);
-	MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, width, height, TRUE);
+		sysmng_update(update);
+		MoveWindow(hWnd, np2oscfg.winx, np2oscfg.winy, cx, cy, TRUE);
+	} while(--cnt);
 }
 
 static void renewalclientsize(void) {
@@ -155,8 +164,7 @@ static void renewalclientsize(void) {
 		}
 		ddraw.scrn.right = np2oscfg.paddingx + scrnwidth;
 		ddraw.scrn.bottom = np2oscfg.paddingy + scrnheight;
-		setwindowsize(scrnwidth, scrnheight);
-		setwindowsize(scrnwidth, scrnheight);
+		setwindowsize(hWndMain, scrnwidth, scrnheight);
 	}
 	scrnsurf.width = width;
 	scrnsurf.height = height;
@@ -313,7 +321,7 @@ void scrnmng_initialize(void) {
 	scrnstat.height = 400;
 	scrnstat.extend = 1;
 	scrnstat.multiple = 8;
-	setwindowsize(640, 400);
+	setwindowsize(hWndMain, 640, 400);
 }
 
 BOOL scrnmng_create(BYTE scrnmode) {
@@ -495,27 +503,34 @@ void scrnmng_destroy(void) {
 	scrnmng_enablemenubar();
 	if (ddraw.clocksurf) {
 		ddraw.clocksurf->Release();
+		ddraw.clocksurf = NULL;
 	}
 	if (ddraw.backsurf) {
 		ddraw.backsurf->Release();
+		ddraw.backsurf = NULL;
 	}
 	if (ddraw.palette) {
 		ddraw.palette->Release();
+		ddraw.palette = NULL;
 	}
 	if (ddraw.clipper) {
 		ddraw.clipper->Release();
+		ddraw.clipper = NULL;
 	}
 	if (ddraw.primsurf) {
 		ddraw.primsurf->Release();
+		ddraw.primsurf = NULL;
 	}
 	if (ddraw.ddraw2) {
 		if (ddraw.scrnmode & SCRNMODE_FULLSCREEN) {
 			ddraw.ddraw2->SetCooperativeLevel(hWndMain, DDSCL_NORMAL);
 		}
 		ddraw.ddraw2->Release();
+		ddraw.ddraw2 = NULL;
 	}
 	if (ddraw.ddraw1) {
 		ddraw.ddraw1->Release();
+		ddraw.ddraw1 = NULL;
 	}
 	ZeroMemory(&ddraw, sizeof(ddraw));
 }
@@ -624,10 +639,20 @@ void scrnmng_setheight(int posy, int hei
 const SCRNSURF *scrnmng_surflock(void) {
 
 	DDSURFACEDESC	destscrn;
+	HRESULT			r;
 
 	ZeroMemory(&destscrn, sizeof(destscrn));
 	destscrn.dwSize = sizeof(destscrn);
-	if (ddraw.backsurf->Lock(NULL, &destscrn, DDLOCK_WAIT, NULL) != DD_OK) {
+	if (ddraw.backsurf == NULL) {
+		return(NULL);
+	}
+	r = ddraw.backsurf->Lock(NULL, &destscrn, DDLOCK_WAIT, NULL);
+	if (r == DDERR_SURFACELOST) {
+		ddraw.backsurf->Restore();
+		r = ddraw.backsurf->Lock(NULL, &destscrn, DDLOCK_WAIT, NULL);
+	}
+	if (r != DD_OK) {
+//		TRACEOUT(("backsurf lock error: %d (%d)", r));
 		return(NULL);
 	}
 	if (!(ddraw.scrnmode & SCRNMODE_ROTATE)) {
@@ -660,6 +685,7 @@ void scrnmng_update(void) {
 
 	POINT	clip;
 	RECT	dst;
+	HRESULT	r;
 
 	if (scrnmng.palchanged) {
 		scrnmng.palchanged = FALSE;
@@ -671,10 +697,13 @@ void scrnmng_update(void) {
 				scrnmng.allflash = 0;
 				clearoutfullscreen();
 			}
-			if (ddraw.primsurf->Blt(&ddraw.scrn, ddraw.backsurf, &ddraw.rect,
-									DDBLT_WAIT, NULL) == DDERR_SURFACELOST) {
-				ddraw.primsurf->Restore();
+			r = ddraw.primsurf->Blt(&ddraw.scrn, ddraw.backsurf, &ddraw.rect,
+															DDBLT_WAIT, NULL);
+			if (r == DDERR_SURFACELOST) {
 				ddraw.backsurf->Restore();
+				ddraw.primsurf->Restore();
+				ddraw.primsurf->Blt(&ddraw.scrn, ddraw.backsurf, &ddraw.rect,
+															DDBLT_WAIT, NULL);
 			}
 		}
 		else {
@@ -689,10 +718,13 @@ void scrnmng_update(void) {
 			dst.top = clip.y + ddraw.scrn.top;
 			dst.right = clip.x + ddraw.scrn.right;
 			dst.bottom = clip.y + ddraw.scrn.bottom;
-			if (ddraw.primsurf->Blt(&dst, ddraw.backsurf, &ddraw.rect,
-									DDBLT_WAIT, NULL) == DDERR_SURFACELOST) {
-				ddraw.primsurf->Restore();
+			r = ddraw.primsurf->Blt(&dst, ddraw.backsurf, &ddraw.rect,
+									DDBLT_WAIT, NULL);
+			if (r == DDERR_SURFACELOST) {
 				ddraw.backsurf->Restore();
+				ddraw.primsurf->Restore();
+				ddraw.primsurf->Blt(&dst, ddraw.backsurf, &ddraw.rect,
+														DDBLT_WAIT, NULL);
 			}
 		}
 	}