--- a/uiacceltk/hitchcock/ServerCore/Src/alfwindowmanager.cpp	Thu Aug 19 10:48:02 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfwindowmanager.cpp	Tue Aug 31 16:07:35 2010 +0300
@@ -208,7 +208,6 @@
 	aWindow->SetSurfaceExtent(aWindow->SurfaceExtent());
     aWindow->SetWindowArea();
     aWindow->SetTransparencyAlphaChannel(aWindow->TransparencyAlphaChannel());
-    aWindow->SetScreenDeviceValid(aWindow->IsScreenDeviceValid());
     aWindow->IncludeToVisibilityCalculation(aWindow->IsIncludedToVisibilityCalculation());
 	aWindow->SetActive(aWindow->IsActive());
 	}
@@ -254,23 +253,16 @@
 
         TInt offset;
         TAlfWindowAttributes* windowAttributes = CreateWindowAttributes(offset);
-        if (windowAttributes)
-            {
-            windowAttributes->iWindowNodeType = wservInfo.iNodeType; 
-            windowAttributes->iScreenNumber = wservInfo.iScreenNumber; 
+        windowAttributes->iWindowNodeType = wservInfo.iNodeType; 
+        windowAttributes->iScreenNumber = wservInfo.iScreenNumber; 
 
-            TAlfBridgerData data;
-            data.Set(EAlfDSDestroyWindow, 
-                wservInfo.iRefId.iWindowGroupId, 
-                wservInfo.iRefId.iWindowIdentifer, 
-                (TAny*)offset); 
-    
-            PostIt(data);
-            }
-		else
-            {
-            CAlfWindow::ReportOOM();
-            }
+    	TAlfBridgerData data;
+        data.Set(EAlfDSDestroyWindow, 
+            wservInfo.iRefId.iWindowGroupId, 
+            wservInfo.iRefId.iWindowIdentifer, 
+            (TAny*)offset); 
+
+        PostIt(data);
 
         iData->iWindows.Remove(i);
         delete &aWindow;
@@ -324,7 +316,7 @@
 // Decaprecated
 // ---------------------------------------------------------------------------
 //   
-EXPORT_C CAlfWindow* CAlfWindowManager::ReserveL( const TWindowIdentifier& /*aId*/, TBool /*aReserveBuffer = ETrue*/ )
+EXPORT_C CAlfWindow* CAlfWindowManager::ReserveL( const TWindowIdentifier& /*aId*/, TBool aReserveBuffer /*= ETrue*/ )
     {
     return 0; // we never get here 
     }
@@ -666,14 +658,7 @@
     TAlfWindowAttributes empty;
     TAlfWindowAttributes* attributes = NULL;
     TRAP_IGNORE(attributes = (TAlfWindowAttributes*)Bridge()->AppendVarDataL( sizeof(TAlfWindowAttributes), aIndex ))
-    if (attributes)
-        {
-        *attributes = empty;
-        }
-    else
-        {
-        CAlfWindow::ReportOOM();
-        }
+    *attributes = empty;
     return attributes;
     }
 
@@ -686,14 +671,7 @@
     TAlfWindowCommandBufferAttributes empty;    
     TAlfWindowCommandBufferAttributes* windowCommandBuffer = NULL;    
     TRAP_IGNORE(windowCommandBuffer = (TAlfWindowCommandBufferAttributes*)Bridge()->AppendVarDataL( sizeof(TAlfWindowCommandBufferAttributes), aIndex ))    
-    if (windowCommandBuffer)
-        {
-        *windowCommandBuffer = empty;
-        }
-    else
-        {
-        CAlfWindow::ReportOOM();
-        }
+    *windowCommandBuffer = empty;
     return windowCommandBuffer;
     }