[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-dev
Subject: [datatype-dev] RE: CR: Enabling WMDRM feature in Phonon
From: <ext-liz.fu () nokia ! com>
Date: 2010-01-26 17:48:14
Message-ID: 218D7B58E1EF544A8DF24C14758BE77028B9226E9D () NOK-EUMSG-02 ! mgdnok ! nokia ! com
[Download RAW message or body]
Missed one file
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.792
diff -u -b -r1.792 helix.bif
--- helix.bif 21 Jan 2010 02:05:51 -0000 1.792
+++ helix.bif 26 Jan 2010 18:40:54 -0000
@@ -3835,6 +3835,7 @@
datatype_wm_common
datatype_dist_wm_rtsp_fileformat
datatype_dist_wm_http_fileformat
+ datatype_wm_wmdrm
</dependlist>
</module>
@@ -4129,6 +4130,30 @@
</dependlist>
</module>
+ <!-- DATATYPE/WM/WMDRM -->
+ <module id="datatype_wm_wmdrm" name="datatype/wm/wmdrm" group="core">
+ <cvs root="helix"/>
+ <attribute id="has_version_file"/>
+
+ <source_dependlist>
+ common_include
+ common_runtime
+ common_system
+ common_util
+ common_container
+ common_dbgtool
+ </source_dependlist>
+
+ <dependlist>
+ common_util
+ common_container
+ common_dbgtool
+ common_runtime
+ common_log_logutil
+ common_system
+ </dependlist>
+ </module>
+
<!-- DATATYPE/COMMON/METAREND -->
<module id="datatype_common_metarend" name="datatype/common/metarend" \
group="core"> <cvs root="helix"/>
________________________________
From: nokia-private-dev-bounces@helixcommunity.org \
[mailto:nokia-private-dev-bounces@helixcommunity.org] On Behalf Of Fu Liz \
(EXT-DextraTech/Dallas)
Sent: Tuesday, January 26, 2010 10:55 AM
To: ribosome-dev@helixcommunity.org; clientapp-dev@helixcommunity.org; \
datatype-dev@helixcommunity.org; nokia-private-dev@helixcommunity.org
Subject: [Nokia-private-dev] CR: Enabling WMDRM feature in Phonon
"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-liz.fu@nokia.com
Reviewed by: junhong.liu@nokia.com
Date: 01/25/2010
Project: Phonon_backend
ErrorId: N/A
Synopsis: Enabling WMDRM in ng-helix
Overview: WMDRM plug-in was developed more than one year ago with connection to old \
WMDRM model. In order to use the new model, the domain app of the plug-in needs to be \
modified. Additionally, WMDRM feature also needs to be enabled in phonon backend.
Solution:
1) Made changes in wmdrm plug-in to connect with wmdrmaccess module.
2) Changed plug-in dll name from hxwmdrmplgin.dll to hxsymwmdrmplugin.dll to avoid \
conflict with original wmdrm. 3) Enabled hxsymwmdrmplugin.dll in build files.
Files Added:
None.
Files Modified:
/cvsroot/clientapps/appframeworks/phonon/PhononSis
/cvsroot/clientapps/appframeworks/phonon/install.pcf
/cvsroot/client/build/BIF/hxclient_4_2_0_brizo.bif
/cvsroot/ribosome/build/umakepf/helix-client-s60-52-ng.pf
/cvsroot/datatype/wm/wmdrm/Umakefil
/cvsroot/datatype/wm/wmdrm/symbian.pcf
/cvsroot/datatype/wm/wmdrm/platform/symbian/symbian_wmdrmplugin.cpp
/cvsroot/datatype/wm/wmdrm/pub/platform/symbian/symbian_wmdrmplugin.h
Image Size and Heap Use impact: minor
Module Release testing (STIF): Currently WMDRM only works with audio (either audio \
only clips, or turn off video for video clips)
Test case(s) Added : No.
Memory leak check performed : No
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles Functionality verified: armv5
Branch: Brizo420, Head
Thanks,
- Liz
Index: hxclient_4_2_0_brizo.bif
===================================================================
RCS file: /cvsroot/client/build/BIF/hxclient_4_2_0_brizo.bif,v
retrieving revision 1.10
diff -u -b -r1.10 hxclient_4_2_0_brizo.bif
--- hxclient_4_2_0_brizo.bif 14 Jan 2010 12:40:19 -0000 \
1.10
+++ hxclient_4_2_0_brizo.bif 26 Jan 2010 17:10:50 -0000
@@ -3854,6 +3854,7 @@
datatype_wm_common
datatype_dist_wm_rtsp_fileformat
datatype_dist_wm_http_fileformat
+ datatype_wm_wmdrm
</dependlist>
</module>
@@ -4121,6 +4122,31 @@
</dependlist>
</module>
+ <!-- DATATYPE/WM/WMDRM -->
+ <module id="datatype_wm_wmdrm" name="datatype/wm/wmdrm" group="core">
+ <cvs root="helix"/>
+ <attribute id="has_version_file"/>
+
+ <source_dependlist>
+ common_include
+ common_runtime
+ common_system
+ common_util
+ common_container
+ common_dbgtool
+ </source_dependlist>
+
+ <dependlist>
+ common_util
+ common_container
+ common_dbgtool
+ common_runtime
+ common_log_logutil
+ common_system
+ </dependlist>
+ </module>
+
+
<!-- DATATYPE/WM/ASX -->
<module id="datatype_wm_asx" group="core" type="name_only">
<dependlist>
Index: helix-client-s60-52-ng.pf
===================================================================
RCS file: /cvsroot/ribosome/build/umakepf/helix-client-s60-52-ng.pf,v
retrieving revision 1.1
diff -u -b -r1.1 helix-client-s60-52-ng.pf
--- helix-client-s60-52-ng.pf 21 Aug 2009 18:59:37 -0000 \
1.1
+++ helix-client-s60-52-ng.pf 26 Jan 2010 17:11:32 -0000
@@ -72,3 +72,8 @@
exec_profile_file("helix-client-s60-armaudio.pfi")
exec_profile_file("helix-client-s60-50-common.pfi")
exec_profile_file("helix-client-s60-52-common.pfi")
+
+project.AddDefines("HELIX_FEATURE_DRM")
+project.AddDefines("HELIX_FEATURE_S60_WMDRM_DOMAIN_API")
+
+
Index: PhononSis
===================================================================
RCS file: /cvsroot/clientapps/appframeworks/phonon/PhononSis,v
retrieving revision 1.1.2.1
diff -u -b -r1.1.2.1 PhononSis
--- PhononSis 5 Nov 2009 23:38:19 -0000 \
1.1.2.1
+++ PhononSis 25 Jan 2010 23:30:45 -0000
@@ -135,6 +135,12 @@
fileHandle.write('copy /B %s %%Prefix%%%s\n' % (fileNames, \
self.DllDest)) fileHandle.write('\n')
+ for fileNames in additional_lib_names_copy:
+ f = os.path.basename(fileNames)
+ fileNames = fileNames.replace(f, PrefixNameSpace(f))
+ fileHandle.write('copy /B %s %%Prefix%%%s\n' % (fileNames, \
self.DllDest)) + fileHandle.write('\n')
+
for fileNames in cfg_files_copy:
fileHandle.write('copy %s %%Prefix%%%s\n' % (fileNames, self.CfgDest))
@@ -215,6 +221,11 @@
file = file.replace(f, PrefixNameSpace(f))
pkg.AddFile(file, '!:\\Sys\\bin\\%s' % os.path.basename(file))
+ for file in additional_lib_names_copy:
+ f = os.path.basename(file)
+ file = file.replace(f, PrefixNameSpace(f))
+ pkg.AddFile(file, '!:\\Sys\\bin\\%s' % os.path.basename(file))
+
else:
pkg.AddPackageDependency(0x101F7960, 0, 0, 0, 'Series60ProductID')
@@ -233,6 +244,11 @@
file = file.replace(f, PrefixNameSpace(f))
pkg.AddFile(file, '!:\\system\\libs\\plugins\\dlls\\%s' % \
os.path.basename(file))
+ for file in additional_lib_names_copy:
+ f = os.path.basename(file)
+ file = file.replace(f, PrefixNameSpace(f))
+ pkg.AddFile(file, '!:\\Sys\\bin\\%s' % os.path.basename(file))
+
if project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):
for file in payld_dll_files_copy:
pkg.AddFile(file, '!:\\sys\\bin\\%s' % os.path.basename(file))
Index: install.pcf
===================================================================
RCS file: /cvsroot/clientapps/appframeworks/phonon/install.pcf,v
retrieving revision 1.1.2.1
diff -u -b -r1.1.2.1 install.pcf
--- install.pcf 5 Nov 2009 23:38:19 -0000 1.1.2.1
+++ install.pcf 25 Jan 2010 23:30:45 -0000
@@ -214,6 +214,10 @@
'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll'
}
+additional_names_map = {
+ 'hxsymwmdrmplugin': 'datatype/wm/wmdrm/[target]/hxsymwmdrmplugin.dll'
+}
+
#
# some helpers to reduce clutter...
#
@@ -372,8 +376,8 @@
# add ASF file format for metadata engine entry
AddMetaDataEntry('asfff')
-# add hxwmdrmplugin to *dll_names*.txt
-#AddAdditionalDLLs('hxwmdrmplugin')
+# add hxsymwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxsymwmdrmplugin')
# remove duplicates that fall under multiple features; sort so we can find more \
easily lib_names = StripDupes(lib_names)
Index: Umakefil
===================================================================
RCS file: /cvsroot/datatype/wm/wmdrm/Umakefil,v
retrieving revision 1.1
diff -u -b -r1.1 Umakefil
--- Umakefil 21 Jan 2009 23:01:57 -0000 1.1
+++ Umakefil 25 Jan 2010 23:27:21 -0000
@@ -87,7 +87,7 @@
project.ExportFunction("CanUnload2", "void")
-DLLTarget('hxwmdrmplugin')
+DLLTarget('hxsymwmdrmplugin')
DependTarget()
Index: symbian.pcf
===================================================================
RCS file: /cvsroot/datatype/wm/wmdrm/symbian.pcf,v
retrieving revision 1.1
diff -u -b -r1.1 symbian.pcf
--- symbian.pcf 21 Jan 2009 23:02:17 -0000 1.1
+++ symbian.pcf 25 Jan 2010 23:27:21 -0000
@@ -65,4 +65,4 @@
project.AddSources("platform\symbian\symbian_wmdrmplugin.cpp")
-project.AddSystemLibraries("AKNNOTIFY.LIB","euser.lib","estlib.lib", \
"WmDrmDecrypter.lib", "flogger.lib", "efsrv.lib" ) \
+project.AddSystemLibraries("AKNNOTIFY.LIB","euser.lib","estlib.lib", \
"wmdrmaccess.lib", "flogger.lib", "efsrv.lib" )
Index: platform/symbian/symbian_wmdrmplugin.cpp
===================================================================
RCS file: /cvsroot/datatype/wm/wmdrm/platform/symbian/symbian_wmdrmplugin.cpp,v
retrieving revision 1.1
diff -u -b -r1.1 symbian_wmdrmplugin.cpp
--- platform/symbian/symbian_wmdrmplugin.cpp 21 Jan 2009 23:02:24 -0000 \
1.1
+++ platform/symbian/symbian_wmdrmplugin.cpp 25 Jan 2010 23:27:21 -0000
@@ -63,7 +63,7 @@
#include <caf/caferr.h>
#include "symbian_wmdrmplugin.h"
#if defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
-#include "wmdrmdecrypter.h"
+#include "wmdrmaccess.h"
#endif
#include "pckunpck.h"
#include "hxtlogutil.h"
@@ -213,7 +213,7 @@
#if defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
- m_pDrm = CWmDrmDecrypter::NewL();
+ m_pDrm = CWmDrmAccess::NewL();
if(m_pDrm)
{
retCode = HXR_OK;
@@ -317,7 +317,8 @@
if (pValues->GetPropertyBuffer("WMDRM_V2_Data", pBuffer) == HXR_OK)
{
#if defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
- dr = m_pDrm->BindRights(pBuffer->GetBuffer(),pBuffer->GetSize());
+ TPtrC8 fileHeader((TUint8 *)pBuffer->GetBuffer(),pBuffer->GetSize());
+ dr = m_pDrm->Initialize (fileHeader);
#endif
if (dr == KErrNone)
{
@@ -441,7 +442,8 @@
{
pMultiPlayloadPacket->GetPayloadInfo(i, playloadOffSet, \
playloadSize); #if defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
- dr = m_pDrm->Decrypt(pBufferDataOut, playloadOffSet, \
playloadSize); + TPtr8 payloadData((TUint8 \
*)(pBufferDataOut+playloadOffSet), playloadSize, playloadSize); + \
dr = m_pDrm->Decrypt(payloadData); #endif
if (dr == KErrNone)
{
Index: pub/platform/symbian/symbian_wmdrmplugin.h
===================================================================
RCS file: /cvsroot/datatype/wm/wmdrm/pub/platform/symbian/symbian_wmdrmplugin.h,v
retrieving revision 1.1
diff -u -b -r1.1 symbian_wmdrmplugin.h
--- pub/platform/symbian/symbian_wmdrmplugin.h 21 Jan 2009 23:02:31 -0000 \
1.1
+++ pub/platform/symbian/symbian_wmdrmplugin.h 25 Jan 2010 23:27:21 -0000
@@ -72,10 +72,8 @@
#include <f32file.h>
-#define HELIX_FEATURE_S60_WMDRM_DOMAIN_API 1
-
#if defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
-class CWmDrmDecrypter;
+class CWmDrmAccess;
#endif
///////////////////////////////////////////////////////////////////////////////
@@ -164,7 +162,7 @@
UINT32 m_ulRefCount;
IUnknown* m_pContext;
#if defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
- CWmDrmDecrypter* m_pDrm;
+ CWmDrmAccess* m_pDrm;
#endif
IHXErrorMessages* m_pErrorMsg;
IHXSourceInput* m_pSourceSink;
[Attachment #3 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML xmlns="http://www.w3.org/TR/REC-html40" xmlns:o =
"urn:schemas-microsoft-com:office:office" xmlns:w =
"urn:schemas-microsoft-com:office:word"><HEAD><TITLE>Nokia Standard Document \
Template</TITLE> <META http-equiv=Content-Type content="text/html; charset=us-ascii">
<META content="MSHTML 6.00.2900.5897" name=GENERATOR>
<STYLE>@font-face {
font-family: SimSun;
}
@font-face {
font-family: Microsoft Sans Serif;
}
@font-face {
font-family: @SimSun;
}
@page {mso-endnote-separator: url("cid:header.htm\@01CA9E75.F4CEB470") es; \
mso-endnote-continuation-separator: url("cid:header.htm\@01CA9E75.F4CEB470") ecs; } \
@page Section1 {size: 595.3pt 841.9pt; margin: 1.0in 28.1pt 42.55pt 56.9pt; } \
P.MsoNormal { FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
LI.MsoNormal {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
DIV.MsoNormal {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
H1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-TRANSFORM: uppercase; TEXT-INDENT: 0in; \
FONT-FAMILY: Arial; mso-list: l0 level1 lfo1 }
H2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level2 lfo1 }
H3 {
FONT-WEIGHT: normal; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; \
FONT-FAMILY: Arial; mso-list: l0 level3 lfo1 }
H4 {
FONT-WEIGHT: normal; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; \
FONT-FAMILY: Arial; mso-list: l0 level4 lfo1 }
H5 {
FONT-WEIGHT: normal; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; \
FONT-FAMILY: Arial; mso-list: l0 level5 lfo1 }
H6 {
FONT-WEIGHT: normal; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; \
FONT-FAMILY: Arial; mso-list: l0 level6 lfo1 }
P.MsoHeading7 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level7 lfo1 }
LI.MsoHeading7 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level7 lfo1 }
DIV.MsoHeading7 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level7 lfo1 }
P.MsoHeading8 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level8 lfo1 }
LI.MsoHeading8 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level8 lfo1 }
DIV.MsoHeading8 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level8 lfo1 }
P.MsoHeading9 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level9 lfo1 }
LI.MsoHeading9 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level9 lfo1 }
DIV.MsoHeading9 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; TEXT-INDENT: 0in; FONT-FAMILY: Arial; \
mso-list: l0 level9 lfo1 }
P.MsoToc1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
LI.MsoToc1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
DIV.MsoToc1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
P.MsoToc2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 11.9pt; FONT-FAMILY: Arial
}
LI.MsoToc2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 11.9pt; FONT-FAMILY: Arial
}
DIV.MsoToc2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 11.9pt; FONT-FAMILY: Arial
}
P.MsoToc3 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 24.1pt; FONT-FAMILY: Arial
}
LI.MsoToc3 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 24.1pt; FONT-FAMILY: Arial
}
DIV.MsoToc3 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 24.1pt; FONT-FAMILY: Arial
}
P.MsoToc4 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 24.1pt; FONT-FAMILY: Arial
}
LI.MsoToc4 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 24.1pt; FONT-FAMILY: Arial
}
DIV.MsoToc4 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 24.1pt; FONT-FAMILY: Arial
}
P.MsoToc5 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 44pt; FONT-FAMILY: Arial
}
LI.MsoToc5 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 44pt; FONT-FAMILY: Arial
}
DIV.MsoToc5 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 44pt; FONT-FAMILY: Arial
}
P.MsoToc6 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 55pt; FONT-FAMILY: Arial
}
LI.MsoToc6 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 55pt; FONT-FAMILY: Arial
}
DIV.MsoToc6 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 55pt; FONT-FAMILY: Arial
}
P.MsoToc7 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 66pt; FONT-FAMILY: Arial
}
LI.MsoToc7 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 66pt; FONT-FAMILY: Arial
}
DIV.MsoToc7 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 66pt; FONT-FAMILY: Arial
}
P.MsoToc8 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 77pt; FONT-FAMILY: Arial
}
LI.MsoToc8 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 77pt; FONT-FAMILY: Arial
}
DIV.MsoToc8 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 77pt; FONT-FAMILY: Arial
}
P.MsoToc9 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 88pt; FONT-FAMILY: Arial
}
LI.MsoToc9 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 88pt; FONT-FAMILY: Arial
}
DIV.MsoToc9 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt 88pt; FONT-FAMILY: Arial
}
P.MsoHeader {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
LI.MsoHeader {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
DIV.MsoHeader {
FONT-SIZE: 11pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
P.MsoFooter {
FONT-SIZE: 7pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
LI.MsoFooter {
FONT-SIZE: 7pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
DIV.MsoFooter {
FONT-SIZE: 7pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: Arial
}
P.00BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; FONT-FAMILY: Arial
}
LI.00BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; FONT-FAMILY: Arial
}
DIV.00BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; FONT-FAMILY: Arial
}
P.02BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.85pt; TEXT-INDENT: -129.85pt; FONT-FAMILY: \
Arial }
LI.02BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.85pt; TEXT-INDENT: -129.85pt; FONT-FAMILY: \
Arial }
DIV.02BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.85pt; TEXT-INDENT: -129.85pt; FONT-FAMILY: \
Arial }
P.01BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
LI.01BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
DIV.01BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
P.11BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; FONT-FAMILY: Arial
}
LI.11BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; FONT-FAMILY: Arial
}
DIV.11BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; FONT-FAMILY: Arial
}
P.Bulletedo2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
LI.Bulletedo2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
DIV.Bulletedo2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
P.22BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.85pt; FONT-FAMILY: Arial
}
LI.22BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.85pt; FONT-FAMILY: Arial
}
DIV.22BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.85pt; FONT-FAMILY: Arial
}
P.12BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.8pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
LI.12BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.8pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
DIV.12BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 129.8pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
P.23BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 194.75pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
LI.23BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 194.75pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
DIV.23BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 194.75pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
P.33BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 194.75pt; FONT-FAMILY: Arial
}
LI.33BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 194.75pt; FONT-FAMILY: Arial
}
DIV.33BodyText {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 194.75pt; FONT-FAMILY: Arial
}
P.Bulletedo1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
LI.Bulletedo1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
DIV.Bulletedo1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
P.Bulleted-1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
LI.Bulleted-1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
DIV.Bulleted-1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
P.NumberedList0 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
LI.NumberedList0 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
DIV.NumberedList0 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 64.9pt; TEXT-INDENT: -64.9pt; FONT-FAMILY: \
Arial }
P.NumberedList1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
LI.NumberedList1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
DIV.NumberedList1 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 82.75pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
P.NumberedList2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
LI.NumberedList2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
DIV.NumberedList2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
P.CodeStyle {
FONT-SIZE: 11pt; MARGIN: 0in 0in 4pt 0.5in; FONT-FAMILY: Arial
}
LI.CodeStyle {
FONT-SIZE: 11pt; MARGIN: 0in 0in 4pt 0.5in; FONT-FAMILY: Arial
}
DIV.CodeStyle {
FONT-SIZE: 11pt; MARGIN: 0in 0in 4pt 0.5in; FONT-FAMILY: Arial
}
P.Bulleted-2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
LI.Bulleted-2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
DIV.Bulleted-2 {
FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt 147.7pt; TEXT-INDENT: -17.85pt; FONT-FAMILY: \
Arial }
P.TitleText {
FONT-WEIGHT: bold; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; FONT-FAMILY: Arial
}
LI.TitleText {
FONT-WEIGHT: bold; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; FONT-FAMILY: Arial
}
DIV.TitleText {
FONT-WEIGHT: bold; FONT-SIZE: 11pt; MARGIN: 0in 0in 11pt; FONT-FAMILY: Arial
}
P.DocumentTitle {
FONT-WEIGHT: bold; FONT-SIZE: 18pt; MARGIN: 140pt 0in 0pt; FONT-FAMILY: Arial
}
LI.DocumentTitle {
FONT-WEIGHT: bold; FONT-SIZE: 18pt; MARGIN: 140pt 0in 0pt; FONT-FAMILY: Arial
}
DIV.DocumentTitle {
FONT-WEIGHT: bold; FONT-SIZE: 18pt; MARGIN: 140pt 0in 0pt; FONT-FAMILY: Arial
}
DIV.Section1 {
page: Section1
}
OL {
MARGIN-BOTTOM: 0in
}
UL {
MARGIN-BOTTOM: 0in
}
</STYLE>
</HEAD>
<BODY lang=EN-US>
<DIV dir=ltr align=left><SPAN class=190024517-26012010><FONT face=Arial
color=#0000ff size=2>Missed one file</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=190024517-26012010><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=190024517-26012010><FONT face=Arial
color=#0000ff size=2>Index:
helix.bif<BR>===================================================================<BR>RCS \
file: /cvsroot/common/build/BIF/helix.bif,v<BR>retrieving revision 1.792<BR>diff
-u -b -r1.792 helix.bif<BR>--- helix.bif 21 Jan 2010 02:05:51
-0000 1.792<BR>+++ helix.bif 26 Jan 2010 18:40:54 -0000<BR>@@ -3835,6
+3835,7
@@<BR>
datatype_wm_common<BR> \
datatype_dist_wm_rtsp_fileformat<BR> \
datatype_dist_wm_http_fileformat<BR>+ \
datatype_wm_wmdrm<BR>
</dependlist><BR>
</module><BR> <BR>@@ -4129,6 +4130,30
@@<BR>
</dependlist><BR>
</module><BR> <BR>+ <!-- DATATYPE/WM/WMDRM
--><BR>+ <module id="datatype_wm_wmdrm"
name="datatype/wm/wmdrm"
group="core"><BR>+ <cvs
root="helix"/><BR>+ <attribute
id="has_version_file"/><BR>+<BR>+
<source_dependlist><BR>+ \
common_include<BR>+ \
common_runtime<BR>+ \
common_system<BR>+ \
common_util<BR>+
common_container<BR>+ \
common_dbgtool<BR>+
</source_dependlist><BR>+<BR>+
<dependlist><BR>+ \
common_util<BR>+
common_container<BR>+ \
common_dbgtool<BR>+ \
common_runtime<BR>+ \
common_log_logutil<BR>+ \
common_system<BR>+
</dependlist><BR>+
</module><BR>+<BR> <!--
DATATYPE/COMMON/METAREND --><BR> <module
id="datatype_common_metarend" name="datatype/common/metarend"
group="core"><BR> <cvs
root="helix"/><BR> </FONT></SPAN></DIV><BR>
<DIV class=OutlookMessageHeader lang=en-us dir=ltr align=left>
<HR tabIndex=-1>
<FONT face=Tahoma size=2><B>From:</B>
nokia-private-dev-bounces@helixcommunity.org
[mailto:nokia-private-dev-bounces@helixcommunity.org] <B>On Behalf Of </B>Fu Liz
(EXT-DextraTech/Dallas)<BR><B>Sent:</B> Tuesday, January 26, 2010 10:55
AM<BR><B>To:</B> ribosome-dev@helixcommunity.org;
clientapp-dev@helixcommunity.org; datatype-dev@helixcommunity.org;
nokia-private-dev@helixcommunity.org<BR><B>Subject:</B> [Nokia-private-dev] CR:
Enabling WMDRM feature in Phonon<BR></FONT><BR></DIV>
<DIV></DIV>
<DIV class=Section1>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">"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."<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">Modified by: \
ext-liz.fu@nokia.com<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">Reviewed
by: junhong.liu@nokia.com<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">Date: 01/25/2010<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">Project: \
Phonon_backend<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">ErrorId: \
N/A<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans Serif" \
color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft \
Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'">Synopsis: Enabling WMDRM in \
ng-helix<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans \
Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: \
'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'">Overview: WMDRM plug-in was \
developed more than one year ago with connection to old WMDRM model. In order to use \
the new model, the domain app of the plug-in needs to be modified. Additionally, \
WMDRM feature also needs to be enabled in phonon backend. \
<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans Serif" \
color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft \
Sans Serif'"> \
<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans Serif" \
color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft \
Sans Serif'">Solution: <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">1)
Made changes in wmdrm plug-in to connect with wmdrmaccess module.
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">2)
Changed plug-in dll name from hxwmdrmplgin.dll to hxsymwmdrmplugin.dll to avoid
conflict with original wmdrm. 3) Enabled hxsymwmdrmplugin.dll in build
files.<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">Files
Added: <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">None.<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">Files \
Modified:<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans \
Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: \
'Microsoft Sans Serif'">/cvsroot/clientapps/appframeworks/phonon/PhononSis<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/clientapps/appframeworks/phonon/install.pcf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/client/build/BIF/hxclient_4_2_0_brizo.bif<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/ribosome/build/umakepf/helix-client-s60-52-ng.pf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/datatype/wm/wmdrm/Umakefil<o:p></o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/datatype/wm/wmdrm/symbian.pcf<o:p></o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/datatype/wm/wmdrm/platform/symbian/symbian_wmdrmplugin.cpp<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'">/cvsroot/datatype/wm/wmdrm/pub/platform/symbian/symbian_wmdrmplugin.h<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">Image Size \
and Heap Use impact: minor<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">Module \
Release testing (STIF): Currently WMDRM only works with audio (either audio \
only clips, or turn off video for video clips)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">Test case(s) Added : \
No.<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans Serif" \
color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft \
Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'">Memory leak check performed : \
No<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans Serif" \
color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft \
Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'">Platforms and Profiles Build Verified: \
helix-client-s60-52-ng<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">Platforms \
and Profiles Functionality verified: armv5 <o:p></o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans \
Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft \
Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; \
FONT-FAMILY: 'Microsoft Sans Serif'">Branch: Brizo420, \
Head<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans \
Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: \
'Microsoft Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face="Microsoft Sans Serif" color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: \
blue; FONT-FAMILY: 'Microsoft Sans Serif'">Thanks,<o:p></o:p></SPAN></FONT></P> <P \
class=MsoNormal><FONT face="Microsoft Sans Serif" color=blue size=2><SPAN \
style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft Sans Serif'">- \
Liz<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face="Microsoft Sans Serif" \
color=blue size=2><SPAN style="FONT-SIZE: 10pt; COLOR: blue; FONT-FAMILY: 'Microsoft \
Sans Serif'"><o:p> </o:p></SPAN></FONT></P> <P class=MsoNormal><FONT face=Arial \
size=2><SPAN style="FONT-SIZE: 11pt">Index: \
hxclient_4_2_0_brizo.bif<o:p></o:p></SPAN></FONT></P> <P class=MsoNormal><FONT \
face=Arial size=2><SPAN style="FONT-SIZE: \
11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file:
/cvsroot/client/build/BIF/hxclient_4_2_0_brizo.bif,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.10<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.10 hxclient_4_2_0_brizo.bif<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
hxclient_4_2_0_brizo.bif \
14 Jan 2010 12:40:19
-0000 \
1.10<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
hxclient_4_2_0_brizo.bif \
26 Jan 2010 17:10:50 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-3854,6 +3854,7 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
datatype_wm_common<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
datatype_dist_wm_rtsp_fileformat<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
datatype_dist_wm_http_fileformat<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ & \
nbsp; &nb \
sp; \
datatype_wm_wmdrm<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
</dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
</module><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-4121,6 +4122,31 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
</dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
</module><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ <!-- DATATYPE/WM/WMDRM
--><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ <module id="datatype_wm_wmdrm"
name="datatype/wm/wmdrm" group="core"><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ <cvs
root="helix"/><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
<attribute id="has_version_file"/><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
<source_dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_include<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_runtime<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_system<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_util<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_container<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_dbgtool<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
</source_dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
<dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_util<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_container<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_dbgtool<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_runtime<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_log_logutil<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
common_system<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
</dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
</module><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <!-- DATATYPE/WM/ASX
--><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <module id="datatype_wm_asx"
group="core" type="name_only"><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
<dependlist><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><o:p> </o:p></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
helix-client-s60-52-ng.pf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file:
/cvsroot/ribosome/build/umakepf/helix-client-s60-52-ng.pf,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1 helix-client-s60-52-ng.pf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
helix-client-s60-52-ng.pf \
21 Aug 2009 18:59:37
-0000 \
1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
helix-client-s60-52-ng.pf \
26 Jan 2010 17:11:32 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-72,3 +72,8 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> exec_profile_file("helix-client-s60-armaudio.pfi")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> exec_profile_file("helix-client-s60-50-common.pfi")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> exec_profile_file("helix-client-s60-52-common.pfi")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+project.AddDefines("HELIX_FEATURE_DRM")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+project.AddDefines("HELIX_FEATURE_S60_WMDRM_DOMAIN_API")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+</SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><o:p> </o:p></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
PhononSis<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file:
/cvsroot/clientapps/appframeworks/phonon/PhononSis,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1.2.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1.2.1 PhononSis<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
PhononSis \
5 Nov 2009 23:38:19
-0000 \
1.1.2.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
PhononSis \
25 Jan 2010 23:30:45 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-135,6 +135,12 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
fileHandle.write('copy /B %s %%Prefix%%%s\n' % (fileNames,
self.DllDest))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
fileHandle.write('\n')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ for
fileNames in additional_lib_names_copy:<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
f = os.path.basename(fileNames)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
fileNames = fileNames.replace(f,
PrefixNameSpace(f))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
fileHandle.write('copy /B %s %%Prefix%%%s\n' % (fileNames,
self.DllDest))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
fileHandle.write('\n')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> for
fileNames in cfg_files_copy:<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
fileHandle.write('copy %s %%Prefix%%%s\n' % (fileNames,
self.CfgDest))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-215,6 +221,11 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> file =
file.replace(f, PrefixNameSpace(f))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
pkg.AddFile(file, '!:\\Sys\\bin\\%s' %
os.path.basename(file))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ for file in
additional_lib_names_copy:<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ f =
os.path.basename(file)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ file =
file.replace(f, PrefixNameSpace(f))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
pkg.AddFile(file, '!:\\Sys\\bin\\%s' %
os.path.basename(file))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> else:<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
pkg.AddPackageDependency(0x101F7960, 0, 0, 0,
'Series60ProductID')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-233,6 +244,11 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> file =
file.replace(f, PrefixNameSpace(f))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
pkg.AddFile(file, '!:\\system\\libs\\plugins\\dlls\\%s' %
os.path.basename(file))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ for file in
additional_lib_names_copy:<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ f =
os.path.basename(file)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ file =
file.replace(f, PrefixNameSpace(f))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
pkg.AddFile(file, '!:\\Sys\\bin\\%s' %
os.path.basename(file))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> if
project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> for file in
payld_dll_files_copy:<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
pkg.AddFile(file, '!:\\sys\\bin\\%s' %
os.path.basename(file))<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
install.pcf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file:
/cvsroot/clientapps/appframeworks/phonon/install.pcf,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1.2.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1.2.1 install.pcf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
install.pcf 5 Nov 2009 23:38:19
-0000 \
1.1.2.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
install.pcf \
25 Jan 2010 23:30:45 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-214,6 +214,10 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
'asfff' :
'datatype/wm/fileformat/[target]/asfff.dll'<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> }<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+additional_names_map = {<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ 'hxsymwmdrmplugin':
'datatype/wm/wmdrm/[target]/hxsymwmdrmplugin.dll'<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+}<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt"> #
some helpers to reduce clutter...<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-372,8 +376,8 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt"> #
add ASF file format for metadata engine entry <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> AddMetaDataEntry('asfff')
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">-# add
hxwmdrmplugin to *dll_names*.txt <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-#AddAdditionalDLLs('hxwmdrmplugin')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+# add
hxsymwmdrmplugin to *dll_names*.txt <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+AddAdditionalDLLs('hxsymwmdrmplugin')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt"> #
remove duplicates that fall under multiple features; sort so we can find more
easily<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> lib_names =
StripDupes(lib_names)</SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><o:p> </o:p></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
Umakefil<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file: /cvsroot/datatype/wm/wmdrm/Umakefil,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1 Umakefil<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
Umakefil 21 Jan 2009 23:01:57
-0000 \
1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
Umakefil \
25 Jan 2010 23:27:21 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-87,7 +87,7 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> project.ExportFunction("CanUnload2",
"void")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-DLLTarget('hxwmdrmplugin')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+DLLTarget('hxsymwmdrmplugin')<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> DependTarget()<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
symbian.pcf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file: /cvsroot/datatype/wm/wmdrm/symbian.pcf,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1 symbian.pcf<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
symbian.pcf \
21 Jan 2009 23:02:17
-0000 \
1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
symbian.pcf \
25 Jan 2010 23:27:21 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-65,4 +65,4 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> project.AddSources("platform\symbian\symbian_wmdrmplugin.cpp")<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-project.AddSystemLibraries("AKNNOTIFY.LIB","euser.lib","estlib.lib", \
"WmDrmDecrypter.lib", "flogger.lib", "efsrv.lib" )<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+project.AddSystemLibraries("AKNNOTIFY.LIB","euser.lib","estlib.lib", \
"wmdrmaccess.lib", "flogger.lib", "efsrv.lib" )<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
platform/symbian/symbian_wmdrmplugin.cpp<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file:
/cvsroot/datatype/wm/wmdrm/platform/symbian/symbian_wmdrmplugin.cpp,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1 symbian_wmdrmplugin.cpp<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
platform/symbian/symbian_wmdrmplugin.cpp \
21 Jan 2009 23:02:24
-0000 \
1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
platform/symbian/symbian_wmdrmplugin.cpp 25 Jan
2010 23:27:21 -0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-63,7 +63,7 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #include
<caf/caferr.h><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #include
"symbian_wmdrmplugin.h"<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #if
defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-#include
"wmdrmdecrypter.h"<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+#include "wmdrmaccess.h"<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #endif<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #include "pckunpck.h"<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #include
"hxtlogutil.h"<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-213,7 +213,7 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #if
defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">- m_pDrm =
CWmDrmDecrypter::NewL();<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ m_pDrm =
CWmDrmAccess::NewL();<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
if(m_pDrm)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> {<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> retCode =
HXR_OK;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-317,7 +317,8 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> if
(pValues->GetPropertyBuffer("WMDRM_V2_Data", pBuffer) ==
HXR_OK)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
{<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #if
defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API) \
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-
dr =
m_pDrm->BindRights(pBuffer->GetBuffer(),pBuffer->GetSize());<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
TPtrC8 fileHeader((TUint8
*)pBuffer->GetBuffer(),pBuffer->GetSize());<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
dr = m_pDrm->Initialize (fileHeader);<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #endif \
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
if (dr == KErrNone)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
{<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-441,7 +442,8 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
{<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
pMultiPlayloadPacket->GetPayloadInfo(i, playloadOffSet,
playloadSize);<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #if
defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API) \
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">- \
dr = m_pDrm->Decrypt(pBufferDataOut, playloadOffSet,
playloadSize);<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
TPtr8 payloadData((TUint8 *)(pBufferDataOut+playloadOffSet), playloadSize,
playloadSize); \
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+ \
dr = m_pDrm->Decrypt(payloadData);<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #endif \
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
if (dr == KErrNone)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> \
{<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">Index:
pub/platform/symbian/symbian_wmdrmplugin.h<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">===================================================================<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">RCS
file:
/cvsroot/datatype/wm/wmdrm/pub/platform/symbian/symbian_wmdrmplugin.h,v<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">retrieving revision 1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">diff -u
-b -r1.1 symbian_wmdrmplugin.h<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">---
pub/platform/symbian/symbian_wmdrmplugin.h 21 Jan
2009 23:02:31
-0000 \
1.1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+++
pub/platform/symbian/symbian_wmdrmplugin.h 25 Jan 2010 23:27:21
-0000<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-72,10 +72,8 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #include
<f32file.h><o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-#define HELIX_FEATURE_S60_WMDRM_DOMAIN_API
1<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #if
defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">-class
CWmDrmDecrypter;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">+class
CWmDrmAccess;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #endif<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> <o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> ///////////////////////////////////////////////////////////////////////////////<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN style="FONT-SIZE: 11pt">@@
-164,7 +162,7 @@<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
UINT32 \
m_ulRefCount;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
IUnknown*
m_pContext;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #if
defined(HELIX_FEATURE_S60_WMDRM_DOMAIN_API)
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">-
CWmDrmDecrypter*
m_pDrm;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">+
CWmDrmAccess*
&n \
bsp; \
m_pDrm;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt"> #endif
<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
IHXErrorMessages*
m_pErrorMsg;<o:p></o:p></SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial size=2><SPAN
style="FONT-SIZE: 11pt">
IHXSourceInput*
m_pSourceSink;</SPAN></FONT></P>
<P class=MsoNormal><FONT face=Arial
size=2><o:p> </o:p></FONT></P></DIV></BODY></HTML>
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
--===============0469620532==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic