# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275058935 -3600
# Node ID de3e07519bb74ef75eba64c10ec4585f7dbb33a7
# Parent  77b29c7ebdbbf4201779c41b24e74abd5691b9a7
Revised patch for unsupported EWsWinOpSetShape - (Bug 1863)

diff -r 77b29c7ebdbb -r de3e07519bb7 windowing/windowserver/nga/CLIENT/RWINDOW.CPP
--- a/windowing/windowserver/nga/CLIENT/RWINDOW.CPP	Fri May 28 15:45:54 2010 +0100
+++ b/windowing/windowserver/nga/CLIENT/RWINDOW.CPP	Fri May 28 16:02:15 2010 +0100
@@ -1203,9 +1203,7 @@
 	__ASSERT_DEBUG(!aRegion.CheckError(),Panic(EW32PanicInvalidRegion));
 	const TInt regionCount=aRegion.Count();
 	TPtrC8 ptrRect(reinterpret_cast<const TUint8*>(aRegion.RectangleList()),regionCount*sizeof(TRect));
-//	return(WriteReplyByProvidingRemoteReadAccess(&regionCount,sizeof(regionCount),&ptrRect,EWsWinOpSetShape));
-	RDebug::Printf("Bug 1863 - RWindowBase::SetShape() deprecated and non-functional. Disabling the panic.");
-	return KErrNone;
+	return(WriteReplyByProvidingRemoteReadAccess(&regionCount,sizeof(regionCount),&ptrRect,EWsWinOpSetShape));
 	}
 
 /** 
diff -r 77b29c7ebdbb -r de3e07519bb7 windowing/windowserver/nga/SERVER/openwfc/cliwin.cpp
--- a/windowing/windowserver/nga/SERVER/openwfc/cliwin.cpp	Fri May 28 15:45:54 2010 +0100
+++ b/windowing/windowserver/nga/SERVER/openwfc/cliwin.cpp	Fri May 28 16:02:15 2010 +0100
@@ -867,6 +867,10 @@
 			case EWsWinOpShadowDisabled:
 				OwnerPanic(EWservPanicOpcode); //this op code is deprecated, should never be generated by the client
 				break;
+			case EWsWinOpSetShape:
+				// Still called from CEikCba::SetBoundingRect, but not supportable in OpenWF - see Bug 1863
+				// OwnerPanic(EWservPanicOpcode); //this op code is not supported in OpenWF
+				break;
 			case EWsWinOpRequiredDisplayMode:
 				if (Backup()!=NULL)
 					OwnerPanic(EWservPanicBackupDisplayMode);