--- 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(®ionCount,sizeof(regionCount),&ptrRect,EWsWinOpSetShape));
- RDebug::Printf("Bug 1863 - RWindowBase::SetShape() deprecated and non-functional. Disabling the panic.");
- return KErrNone;
+ return(WriteReplyByProvidingRemoteReadAccess(®ionCount,sizeof(regionCount),&ptrRect,EWsWinOpSetShape));
}
/**
--- 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);