Change looks good.

=======================================
Eric Hyche (ehyche at real.com)
Principal Engineer
RealNetworks, Inc.


>-----Original Message-----
>From: datatype-dev-bounces at helixcommunity.org [mailto:datatype-dev-bounces at helixcommunity.org] On
>Behalf Of ext-debashis.2.panigrahi at nokia.com
>Sent: Friday, September 04, 2009 1:07 AM
>To: datatype-dev at helixcommunity.org
>Subject: [datatype-dev] CR: GJIA-7VBTK8: Helix setting secure output doesn't work properly
>
>"Nokia submits this code under the terms of a commercial contribution agreement with RealNetworks, and
>I am authorized to contribute this code under said agreement."
>
>Modified by:  ext-debashis.2.panigrahi at nokia.com
>
>Reviewed by: Patrick.Amick at nokia.com; rajesh.rathinasamy at nokia.com
>
>TSW Id: GJIA-7VBTK8
>
>Date: 09/03/2009
>
>Project: SymbianMmf_wm
>
>Synopsis: Helix setting secure output doesn't work properly
>
>Overview:
>This bug was introduced as a fix for BYAN-7TJLLJ (as per the error report).
>When the XPS server gets the message XPS_GetSecureOutputModeAsync (CXPSServerSession::ServiceL()@
>CXPSServerSession.cpp) from client it calls m_pXPSSession-
>>HandleGetSecureOutputModeAsync(mesg)(CXPSSession::DoHandleGetSecureOutputMode(const RMessage2& mesg)
>(File: CXPSSession.cpp) which in turn calls DoHandleGetSecureOutputMode(mesg)(File:CXPSSession.cpp),
>but here IRetval is not being updated on success.
>
>Fix:
>Updated IRetval to hold the error code returned from message Write(..) and added a check to return
>with error in case the first call to message Write(..) itself fails.
>
>Files modified & changes for 210Cays, 223Cays and HEAD:
>/datatype/xps/PacketSink/CXPSSession.cpp
>
>Image Size and Heap Use impact: No major impact
>
>Module Release testing (STIF) : Yes
>
>Test case(s) Added  : No
>
>Memory leak check performed : Passed, No additional leaks introduced.
>
>Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-dsp
>
>Platforms and Profiles Functionality verified: armv5
>
>Branch: 210Cays, 223Cays and HEAD
>
>CVS Diff:
>
>Index: CXPSSession.cpp
>===================================================================
>RCS file: /cvsroot/datatype/xps/PacketSink/CXPSSession.cpp,v
>retrieving revision 1.1.1.1.2.4.4.2
>diff -u -w -r1.1.1.1.2.4.4.2 CXPSSession.cpp
>--- CXPSSession.cpp     6 Jul 2009 14:43:57 -0000       1.1.1.1.2.4.4.2
>+++ CXPSSession.cpp     3 Sep 2009 03:18:32 -0000
>@@ -614,11 +614,14 @@
>     XPS_LOG(_L("CXPSSession::DoHandleGetSecureOutputMode >>"));
>     TInt lRetval = KErrGeneral;
>
>-
>     TPckgBuf<TUint> pckg0(m_ulSecureOutBitMask);
>-    mesg.Write(0, pckg0);
>+    lRetval = mesg.Write(0, pckg0);
>+
>+    if(lRetval == KErrNone)
>+    {
>     TPckgBuf<SecureOutputInfo> pckg1(m_SecureOutputInfo);
>-    mesg.Write(1, pckg1);
>+        lRetval = mesg.Write(1, pckg1);
>+    }
>
>     XPS_LOG(_L("CXPSSession[%x]::DoHandleGetSecureOutputMode rv:%d"), this, lRe tval);
>     mesg.Complete(lRetval);
>
>_______________________________________________
>Datatype-dev mailing list
>Datatype-dev at helixcommunity.org
>http://lists.helixcommunity.org/mailman/listinfo/datatype-dev