--- a/mmmw_plat/openmax_al_api/tsrc/openmaxaltestmodule/src/common/openmaxalcommontests.cpp	Fri Sep 17 08:33:15 2010 +0300
+++ b/mmmw_plat/openmax_al_api/tsrc/openmaxaltestmodule/src/common/openmaxalcommontests.cpp	Mon Oct 04 00:51:56 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -10,7 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
-* 
+*
 * Description: This file contains testclass implementation.
 *
 */
@@ -25,7 +25,7 @@
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
 
-// EXTERNAL FUNCTION PROTOTYPES  
+// EXTERNAL FUNCTION PROTOTYPES
 //extern ?external_function( ?arg_type,?arg_type );
 
 // CONSTANTS
@@ -79,7 +79,7 @@
 
     TInt sinktype(0);
     XADataSink commonSink = {NULL,NULL};
-    
+
     status = aItem.GetNextInt(type);
     if(!status)
         {
@@ -171,7 +171,7 @@
                      break;
                  }
              }
-         }    
+         }
     return status;
     }
 
@@ -191,7 +191,7 @@
             case XA_DATALOCATOR_URI:
                 {
                 commonSource.pLocator = &m_Uri;
-                }                
+                }
                 break;
             case XA_DATALOCATOR_ADDRESS:
             case XA_DATALOCATOR_IODEVICE:
@@ -227,8 +227,8 @@
                 }
             }
         }
-    
-    
+
+
     if(!status)
         {
         status = aItem.GetNextInt(sourcetype);
@@ -248,15 +248,15 @@
                 case 4:
                     m_DynamicSource = commonSource;
                     break;
-                    
+
                 default:
                     status = KErrGeneral;
                     break;
                 }
             }
         }
-    
-    return status;  
+
+    return status;
     }
 
 TInt COpenMAXALTestModule::al_SetDataLocator( CStifItemParser& aItem )
@@ -265,7 +265,7 @@
     TInt type;
 
     status = aItem.GetNextInt(type);
-    
+
     switch(type)
         {
         case XA_DATALOCATOR_URI:
@@ -280,7 +280,7 @@
             status = aItem.GetNextString(uri);
             if(!status)
                 {
-                m_URIName = HBufC8::NewL(uri.Length()+1); 
+                m_URIName = HBufC8::NewL(uri.Length()+1);
                 TPtr8 desc = m_URIName->Des();
                 desc.Copy(uri);
                 m_Uri.locatorType = XA_DATALOCATOR_URI;
@@ -296,7 +296,7 @@
             {
             TInt devicetype;
             TUint deviceId;
-            
+
             status = aItem.GetNextInt(devicetype);
             if(!status)
                 {
@@ -311,13 +311,13 @@
                             {
                             m_SrcIODevice.deviceID = deviceId;
                             m_SrcIODevice.deviceType = devicetype;
-                            m_SrcIODevice.locatorType = XA_DATALOCATOR_IODEVICE;                    
+                            m_SrcIODevice.locatorType = XA_DATALOCATOR_IODEVICE;
                             }
                         else
                             {
                             m_SinkIODevice.deviceID = deviceId;
                             m_SinkIODevice.deviceType = devicetype;
-                            m_SinkIODevice.locatorType = XA_DATALOCATOR_IODEVICE;                    
+                            m_SinkIODevice.locatorType = XA_DATALOCATOR_IODEVICE;
                             }
                         }
                     else
@@ -344,7 +344,7 @@
             status = KErrGeneral;
             break;
         }
-    return status;   
+    return status;
     }
 
 TInt COpenMAXALTestModule::al_SetDataFormat( CStifItemParser& aItem )
@@ -354,7 +354,7 @@
     TInt contType(0);
     TPtrC mimetype;
     status = aItem.GetNextInt(type);
-    
+
     switch(type)
         {
         case XA_DATAFORMAT_MIME:
@@ -370,7 +370,7 @@
                         delete m_MimeType;
                         m_MimeType = NULL;
                         }
-                    m_MimeType = HBufC8::NewL(mimetype.Length()+1); 
+                    m_MimeType = HBufC8::NewL(mimetype.Length()+1);
                     TPtr8 desc = m_MimeType->Des();
                     desc.Copy(mimetype);
                     m_Mime.formatType = XA_DATAFORMAT_MIME;
@@ -395,7 +395,7 @@
             status = KErrGeneral;
             break;
         }
-    return status;   
+    return status;
     }
 
 TInt COpenMAXALTestModule::al_CreateWindow( CStifItemParser& aItem )
@@ -410,7 +410,7 @@
     TInt bottomY;
     TInt posX;
     TInt posY;
-    
+
     status = aItem.GetNextInt(posX);
     RET_ERR_IF_ERR(status);
     status = aItem.GetNextInt(posY);
@@ -471,3 +471,43 @@
     iRwSession.Close();
     return KErrNone;
     }
+
+TInt COpenMAXALTestModule::CheckForNull(CStifItemParser& aItem, void*& paramPtr)
+    {
+    TInt status(KErrNone);
+    TPtrC itfc;
+    _LIT(ifc,"null");
+    _LIT(invalidItfc, "invalid");
+    status = aItem.GetNextString(itfc);
+    if(!status)
+        {
+        if(!itfc.Compare(ifc))
+            {
+            paramPtr = NULL;
+            }
+        else if (itfc.Compare(invalidItfc) == 0)
+            {
+            paramPtr = (void *)&aItem;
+            }
+        }
+    return status;
+    }
+
+TInt COpenMAXALTestModule::CheckForNullParam(CStifItemParser& aItem, void*& paramPtr)
+    {
+    TInt status(KErrNone);
+    TInt itfc;
+    status = aItem.GetNextInt(itfc);
+    if(!status)
+        {
+        if(itfc != KErrNotFound)
+            {
+            paramPtr = (void*)&itfc;
+            }
+        else
+            {
+            paramPtr = NULL;
+            }
+        }
+    return status;
+    }