[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-dev
Subject: [datatype-dev] [Nokia-private-dev] CR: Fix HTTP WM Streaming issue
From: <girish.shetty () nokia ! com>
Date: 2008-10-23 22:12:50
Message-ID: 6065259110819A48A3DC58D4547FD46E0309DE11 () siebe101 ! NOE ! Nokia ! com
[Download RAW message or body]
--===============1834810481==
Content-class: urn:content-classes:message
Content-Type: multipart/alternative;
boundary="----_=_NextPart_001_01C9355C.7F588866"
This is a multi-part message in MIME format.
> "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: girish.shetty@nokia.com
> Reviewed by:
> Date: October-22-2008
> Project: SymbianMmf_wm
> ErrorId: N/A
> Synopsis: Streaming using http, takes a long time to connect (or
> unable to connect), and after a while; System error message appears
>
> Overview: Because of the reasons listed below, HTTP WM streaming was
> not working in HEAD Branch:
> * Inconsistency in using Append operation on wide character string
> [CWMSStringW]
> * Bug in CWMSStringW class [indexing and modifying beyond the size
> of data member]
> * Improper use of code for calculating length of buffer in
> WideCharToMultiByte function
> Files Modified:
> datatype-restricted\wm\http\fileformat\HttpClient.cpp
> datatype-restricted\wm\http\fileformat\HttpRequest.cpp
> datatype-restricted\wm\http\fileformat\HttpStreamFlowHeaders.cpp
> datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\i
> nclude\wmsstring.h
> datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\h
> elix\helix_win32_functions.h
> datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\c
> ommon\inetrequest.h
> datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\r
> tsp\RtspClient.cpp
> datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\r
> tsp\RtspRequest.cpp
> datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\r
> tsp\RtspStreamFlowHeaders.cpp
> New files added: None.
> Image Size and Heap Use impact: no major impact
> Module Release testing (STIF) : passed local test cases
> Test case(s) Added : No.
> Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-dsp
> branch: helix_restricted
> platform: symbian-91-armv5
> target(s): symbianMmf_wm
>
> Branch: HEAD, 210 Cays, 221Cayns
>
DIFF:
Index: HttpClient.cpp
===================================================================
RCS file: /cvsroot/wmcode-protocol/http/fileformat/HttpClient.cpp,v
retrieving revision 1.2
diff -u -b -r1.2 HttpClient.cpp
--- HttpClient.cpp 8 Apr 2008 18:33:25 -0000 1.2
+++ HttpClient.cpp 22 Oct 2008 19:12:30 -0000
@@ -118,9 +118,9 @@
// Construct the HTTP User-Agent.
m_HttpUserAgent.Append(g_szUAString, g_cchUAString);
- m_HttpUserAgent.Append(" (");
+ m_HttpUserAgent.Append(L" (");
m_HttpUserAgent.Append(m_UserAgent);
- m_HttpUserAgent.Append(")");
+ m_HttpUserAgent.Append(L")");
// Pragma: version11-enabled header.
pRequest->m_Headers.Add(g_Pragma, L"version11-enabled=1" );
@@ -324,10 +324,13 @@
(pSwitch[i].dwNewStreamNumber !=
CStreamSwitch::NO_STREAM))
{
// Add this stream to the Stream Select string and
count it.
- if ( m_SSCount > 0 ) { m_SSEntry.AppendChar(' '); }
+ if ( m_SSCount > 0 )
+ {
+ m_SSEntry.AppendChar(L' ');
+ }
m_SSEntry.Append(L"ffff:", 5);
m_SSEntry.AppendUInt((unsigned
int)(pSwitch[i].dwNewStreamNumber));
- m_SSEntry.AppendChar(':');
+ m_SSEntry.AppendChar(L':');
m_SSEntry.AppendUInt((unsigned
int)(pSwitch[i].dwModifier));
m_SSCount++;
@@ -647,13 +650,13 @@
{
CWMSStringW strSSE;
strSSE.Append(g_szPragmaStreamSwitchEntry);
- strSSE.AppendChar('=');
+ strSSE.AppendChar(L'=');
strSSE.Append(m_SSEntry);
pRequest->m_Headers.Add(g_Pragma, strSSE.PContents(),
strSSE.GetLength());
CWMSStringW strSSC;
strSSC.Append(g_szPragmaStreamSwitchCount);
- strSSC.AppendChar('=');
+ strSSC.AppendChar(L'=');
strSSC.AppendInt(m_SSCount);
pRequest->m_Headers.Add(g_Pragma, strSSC.PContents(),
strSSC.GetLength());
}
@@ -683,7 +686,7 @@
{
CWMSStringW str;
str.Append(g_szPragmaPlaylistSeekId);
- str.AppendChar('=');
+ str.AppendChar(L'=');
str.AppendUInt(PPresDesc()->m_dwPlaylistGenId);
pRequest->m_Headers.Add(g_Pragma, str.PContents(),
str.GetLength());
}
@@ -1673,7 +1676,7 @@
{
CWMSStringW str;
str.Append(g_szPragmaXClientGuid);
- str.AppendChar('=');
+ str.AppendChar(L'=');
str.Append(g_szGuidString);
pRequest->m_Headers.Add(g_Pragma, str.PContents(),
str.GetLength());
}
@@ -1690,7 +1693,7 @@
str.Append(m_Uri.Host(), m_Uri.HostLength());
if( m_Uri.Port() > 0 )
{
- str.AppendChar(':');
+ str.AppendChar(L':');
str.AppendUInt(m_Uri.Port());
}
pRequest->m_Headers.Add(g_Host, str.PContents(),
str.GetLength());
@@ -1701,7 +1704,7 @@
{
CWMSStringW str;
str.Append(g_szPragmaClientId);
- str.AppendChar('=');
+ str.AppendChar(L'=');
str.Append(m_ClientId.PContents());
pRequest->m_Headers.Add(g_Pragma, str.PContents(),
str.GetLength());
}
Index: HttpRequest.cpp
===================================================================
RCS file: /cvsroot/wmcode-protocol/http/fileformat/HttpRequest.cpp,v
retrieving revision 1.1.1.1
diff -u -b -r1.1.1.1 HttpRequest.cpp
--- HttpRequest.cpp 24 Jan 2008 20:42:25 -0000 1.1.1.1
+++ HttpRequest.cpp 22 Oct 2008 19:12:30 -0000
@@ -830,15 +830,13 @@
// server is expecting FEC stream in format 0x0002nnnn
dw = (m_Switch.dwOldStreamNumber != 0xffffffff) ?
(m_Switch.dwOldStreamNumber & 0xfffff) : 0xffffffff;
Headers.AppendUInt(dw);
-
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
dw = (m_Switch.dwNewStreamNumber != 0xffffffff) ?
(m_Switch.dwNewStreamNumber & 0xfffff) : 0xffffffff;
Headers.AppendUInt(dw);
-
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
Headers.AppendUInt(m_Switch.dwModifier);
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
// add old stream name
if(m_Switch.dwOldStreamNumber != 0xffffffff)
@@ -865,7 +863,7 @@
// separator between names
if(fAddSep)
{
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
}
Headers.Append(p->m_StreamUrl.PContents(),
p->m_StreamUrl.Length());
Index: HttpStreamFlowHeaders.cpp
===================================================================
RCS file:
/cvsroot/wmcode-protocol/http/fileformat/HttpStreamFlowHeaders.cpp,v
retrieving revision 1.2
diff -u -b -r1.2 HttpStreamFlowHeaders.cpp
--- HttpStreamFlowHeaders.cpp 8 Apr 2008 18:33:25 -0000 1.2
+++ HttpStreamFlowHeaders.cpp 22 Oct 2008 19:12:30 -0000
@@ -112,7 +112,7 @@
case INetClient::RANGE_UNDEFINED:
// No range defined. Default to stream the whole file.
Headers.Append(L"Pragma:
rate=1.000,stream-offset=4294967295:4294967295,packet-num=4294967295,str
eam-time=0,max-duration=0");
- Headers.Append("\r\n", 2);
+ Headers.Append(L"\r\n", 2);
break;
case INetClient::RANGE_TO_TIME:
@@ -137,7 +137,7 @@
// Start offset is not set. Default to stream the
whole file.
Headers.Append(L"Pragma:
rate=1.000,stream-offset=4294967295:4294967295,packet-num=4294967295,str
eam-time=0,max-duration=0");
}
- Headers.Append("\r\n", 2);
+ Headers.Append(L"\r\n", 2);
break;
case INetClient::RANGE_TO_PACKET:
@@ -164,7 +164,7 @@
// Note: stream-time must be zero so that max-duration
works properly.
Headers.Append(L"Pragma:
rate=1.000,stream-offset=4294967295:4294967295,packet-num=0,stream-time=
0,max-duration=0");
}
- Headers.Append("\r\n", 2);
+ Headers.Append(L"\r\n", 2);
break;
case INetClient::RANGE_TO_BYTE_OFFSET:
@@ -173,7 +173,7 @@
// Note: stream-time must be zero so that max-duration
works properly.
Headers.Append(L"Pragma:
rate=1.000,packet-num=4294967295,stream-time=0,stream-offset=");
Headers.AppendUInt64(s.StartOffset);
- Headers.AppendChar(':');
+ Headers.AppendChar(L':');
if ( s.StopOffset != (QWORD)(-1) )
{
@@ -181,7 +181,7 @@
}
else
{
- Headers.AppendChar('0');
+ Headers.AppendChar(L'0');
}
// Unable to specify duration, so default to rest of
clip.
@@ -193,7 +193,7 @@
// Note: stream-time must be zero so that max-duration
works properly.
Headers.Append(L"Pragma:
rate=1.000,stream-offset=0:0,packet-num=4294967295,stream-time=0,max-dur
ation=0");
}
- Headers.Append("\r\n", 2);
+ Headers.Append(L"\r\n", 2);
break;
case INetClient::RANGE_CURRENT: // Not supported.
>
Index: common/inetrequest.h
===================================================================
RCS file:
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/c
ommon/inetrequest.h,v
retrieving revision 1.5
diff -u -b -r1.5 inetrequest.h
--- common/inetrequest.h 8 Apr 2008 18:47:32 -0000 1.5
+++ common/inetrequest.h 22 Oct 2008 19:40:14 -0000
@@ -432,7 +432,7 @@
Headers.Append( L"\r\n", 2 );
// allocate buffer
- cchA = Headers.Length()*3;
+ cchA = Headers.Length()* sizeof(WCHAR) + 1;
CHECKHR_RET(CNetBuffer::CreateInstance( cchA, &pBuffer ));
Index: helix/helix_win32_functions.h
===================================================================
RCS file:
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/h
elix/helix_win32_functions.h,v
retrieving revision 1.6
diff -u -b -r1.6 helix_win32_functions.h
--- helix/helix_win32_functions.h 7 Apr 2008 08:40:47 -0000
1.6
+++ helix/helix_win32_functions.h 22 Oct 2008 19:40:14 -0000
@@ -227,7 +227,7 @@
// Convert the string to ANSI
HLXOsStrW strIn(lpWideCharStr, cchWideChar);
// Get the length (in chars of the string)
- int lLen = strlen((const char*) strIn);
+ int lLen = strIn.GetOutSize();
// Compute the number of bytes to copy
int lCharsToCopy = lLen;
if (lCharsToCopy > cbMultiByte)
Index: include/wmsstring.h
===================================================================
RCS file:
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/i
nclude/wmsstring.h,v
retrieving revision 1.4
diff -u -b -r1.4 wmsstring.h
--- include/wmsstring.h 17 Oct 2007 22:31:39 -0000 1.4
+++ include/wmsstring.h 22 Oct 2008 19:40:14 -0000
@@ -303,9 +303,13 @@
void CWMSStringT< T, Fixed, Chunk, OptAppend>::_init()
{
#ifdef _SYMBIAN
- m_EmptyString[1] = 0;
+ m_EmptyString[0] = 0;
#endif
m_hr = S_OK;
+
+ //Initializing m_FixedBuffer with ZEROs
+ memset(m_FixedBuffer, 0, sizeof(T) * Fixed);
+
m_pBuffer = m_FixedBuffer;
m_cBuffer = Fixed;
m_cData = 0;
Index: rtsp/RtspClient.cpp
===================================================================
RCS file:
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/r
tsp/RtspClient.cpp,v
retrieving revision 1.8
diff -u -b -r1.8 RtspClient.cpp
--- rtsp/RtspClient.cpp 16 Apr 2008 15:24:45 -0000 1.8
+++ rtsp/RtspClient.cpp 22 Oct 2008 19:40:15 -0000
@@ -1931,11 +1931,11 @@
if( c == '\\' )
{
pPres->m_BaseUrl.ReleaseBuffer(pPres->m_BaseUrl.Length()-1);
- pPres->m_BaseUrl.AppendChar('/');
+ pPres->m_BaseUrl.AppendChar(L'/');
}
else if( c != '/' )
{
- pPres->m_BaseUrl.AppendChar('/');
+ pPres->m_BaseUrl.AppendChar(L'/');
}
}
Index: rtsp/RtspRequest.cpp
===================================================================
RCS file:
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/r
tsp/RtspRequest.cpp,v
retrieving revision 1.3
diff -u -b -r1.3 RtspRequest.cpp
--- rtsp/RtspRequest.cpp 17 Oct 2007 22:44:22 -0000 1.3
+++ rtsp/RtspRequest.cpp 22 Oct 2008 19:40:15 -0000
@@ -51,7 +51,7 @@
{
Str.Append(L"RTP/AVP/TCP;unicast;interleaved=");
Str.AppendUInt(Channel.Num);
- Str.AppendChar('-');
+ Str.AppendChar(L'-');
Str.AppendUInt(Channel.Num+1);
}
else if( MediaTransport == RTP_AVP_UDP || MediaTransport == RTP_AVP
)
@@ -71,7 +71,7 @@
Str.AppendUInt(Ports.Data);
if( Ports.Feedback != 0 )
{
- Str.AppendChar('-');
+ Str.AppendChar(L'-');
Str.AppendUInt(Ports.Feedback);
}
}
@@ -79,7 +79,7 @@
if( Ssrc != 0 )
{
- Str.Append(";ssrc=");
+ Str.Append(L";ssrc=");
Str.AppendByte((BYTE)(Ssrc >> 24));
Str.AppendByte((BYTE)(Ssrc >> 16));
@@ -623,7 +623,7 @@
HRESULT hr;
Headers.Append( m_Verb.PContents(), m_Verb.Length() );
- Headers.AppendChar( L' ' );
+ Headers.AppendChar(L' ');
Headers.Append( m_Url.PContents(), m_Url.Length() );
Headers.Append( L" RTSP/1.0\r\n", 11 );
@@ -1267,12 +1267,12 @@
m_Output.Append(L"url=", 4);
if(fQuote)
{
- m_Output.AppendChar('"');
+ m_Output.AppendChar(L'"');
}
m_Output.Append(pszUrl, cchUrl);
if(fQuote)
{
- m_Output.AppendChar('"');
+ m_Output.AppendChar(L'"');
}
m_fAddSemiColon = TRUE;
@@ -1283,7 +1283,7 @@
{
if(m_fAddSemiColon)
{
- m_Output.AppendChar(';');
+ m_Output.AppendChar(L';');
m_fAddSemiColon = FALSE;
}
@@ -1313,14 +1313,14 @@
dw = (m_Switch.dwOldStreamNumber != 0xffffffff) ?
(m_Switch.dwOldStreamNumber & 0xfffff) : 0xffffffff;
Headers.AppendUInt(dw);
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
dw = (m_Switch.dwNewStreamNumber != 0xffffffff) ?
(m_Switch.dwNewStreamNumber & 0xfffff) : 0xffffffff;
Headers.AppendUInt(dw);
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
Headers.AppendUInt(m_Switch.dwModifier);
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
// add old stream name
if(m_Switch.dwOldStreamNumber != 0xffffffff)
@@ -1347,7 +1347,7 @@
// separator between names
if(fAddSep)
{
- Headers.AppendChar(' ');
+ Headers.AppendChar(L' ');
}
Headers.Append(p->m_StreamUrl.PContents(),
p->m_StreamUrl.Length());
Index: rtsp/RtspStreamFlowHeaders.cpp
===================================================================
RCS file:
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/r
tsp/RtspStreamFlowHeaders.cpp,v
retrieving revision 1.3
diff -u -b -r1.3 RtspStreamFlowHeaders.cpp
--- rtsp/RtspStreamFlowHeaders.cpp 26 Oct 2006 13:42:05 -0000
1.3
+++ rtsp/RtspStreamFlowHeaders.cpp 22 Oct 2008 19:40:15 -0000
@@ -67,16 +67,16 @@
if(Sign < 0 && lVal != 0)
{
- Str.AppendChar('-');
+ Str.AppendChar(L'-');
}
Str.AppendInt64(lHigh);
- Str.AppendChar('.');
+ Str.AppendChar(L'.');
if(lLow < 100)
{
- Str.AppendChar('0');
+ Str.AppendChar(L'0');
if(lLow < 10)
{
- Str.AppendChar('0');
+ Str.AppendChar(L'0');
}
}
@@ -127,7 +127,7 @@
PrintPseudoFloat( Headers, s.StartOffset );
}
- Headers.Append("-", 1);
+ Headers.Append(L"-", 1);
if( s.StopOffset != -1 )
{
@@ -150,7 +150,7 @@
Headers.AppendUInt64(s.StartOffset);
}
- Headers.Append("-", 1);
+ Headers.Append(L"-", 1);
if( s.StopOffset != -1 )
{
@@ -174,7 +174,7 @@
Headers.AppendUInt64( s.StartOffset );
}
- Headers.Append("-", 1);
+ Headers.Append(L"-", 1);
if( s.StopOffset != -1 )
{
@@ -188,7 +188,7 @@
return E_INVALIDARG;
}
- Headers.Append("\r\n", 2);
+ Headers.Append(L"\r\n", 2);
}
return S_OK;
Regards
Girish
[Attachment #3 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<META NAME="Generator" CONTENT="MS Exchange Server version 6.5.7653.3">
<TITLE>[Nokia-private-dev] CR: Fix HTTP WM Streaming issue</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/rtf format -->
<P><FONT SIZE=2 FACE="Verdana">"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."</FONT></P> <UL>
<P><FONT SIZE=2 FACE="Verdana">Modified by: girish.shetty@nokia.com<BR>
Reviewed by:<BR>
Date: October-</FONT><FONT COLOR="#000000" SIZE=2 FACE="Verdana">22</FONT><FONT \
SIZE=2 FACE="Verdana">-2008<BR>
Project: SymbianMmf_wm </FONT>
</UL>
<P><FONT SIZE=2 FACE="Verdana">ErrorId<B>:</B> </FONT><FONT COLOR="#000000" SIZE=2 \
FACE="Verdana">N/A</FONT><FONT SIZE=2 FACE="Verdana"> </FONT> <UL>
<P><FONT SIZE=2 FACE="Verdana">Synopsis: </FONT><FONT COLOR="#000000" SIZE=2 \
FACE="Verdana">Streaming using http, takes a long time to connect (or unable to \
connect), and after a while; System error message appears</FONT><BR> <BR>
<FONT SIZE=2 FACE="Verdana">Overview:</FONT><FONT COLOR="#000000" SIZE=2 \
FACE="Verdana"> Because of the reasons listed below, HTTP WM streaming was not \
working in HEAD Branch:</FONT>
<UL>
<LI><FONT COLOR="#000000" SIZE=2 FACE="Verdana">Inconsistency in using Append \
operation on wide character string [CWMSStringW]</FONT></LI>
<LI><FONT COLOR="#000000" SIZE=2 FACE="Verdana">Bug in CWMSStringW class [indexing \
and modifying beyond the size of data member]</FONT></LI>
<LI><FONT COLOR="#000000" SIZE=2 FACE="Verdana">Improper use of code for calculating \
length of buffer in WideCharToMultiByte function</FONT></LI> </UL></UL>
<P><FONT SIZE=2 FACE="Verdana">Files Modified:</FONT>
<UL>
<P><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\http\fileformat\HttpClient.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\http\fileformat\HttpRequest.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\http\fileformat\HttpStreamFlowHeaders.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\include\wmsstring.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\helix\helix_win32_functions.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\common\inetrequest.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\rtsp\RtspClient.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\rtsp\RtspRequest.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">datatype-restricted\wm\rtsp\import\wmrtsp-porting-kit\network\client\rtsp\RtspStreamFlowHeaders.cpp</FONT>
</UL>
<P><FONT SIZE=2 FACE="Verdana">New files added:</FONT><FONT COLOR="#0000FF" SIZE=2 \
FACE="Bookman Old Style"></FONT> <FONT SIZE=2 FACE="Verdana">None.<BR> Image Size and \
Heap Use impact: no major impact<BR> Module Release testing (STIF) : passed local \
test cases </FONT>
<BR><FONT SIZE=2 FACE="Verdana">Test case(s) Added : No.<BR>
Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-dsp<BR>
branch: helix_restricted</FONT>
<BR><FONT SIZE=2 FACE="Verdana">platform: symbian-91-armv5</FONT>
<BR><FONT SIZE=2 FACE="Verdana">target(s): symbianMmf_wm</FONT>
<BR>
<BR><FONT SIZE=2 FACE="Verdana">Branch: HEAD, 210 Cays, 221Cayns</FONT>
</P>
<P><FONT SIZE=2 FACE="Verdana">DIFF:</FONT>
</P>
<P><FONT SIZE=2 FACE="Verdana">Index: HttpClient.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/http/fileformat/HttpClient.cpp,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.2</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.2 HttpClient.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- HttpClient.cpp 8 \
Apr 2008 18:33:25 -0000 1.2</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ HttpClient.cpp 22 \
Oct 2008 19:12:30 -0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -118,9 +118,9 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // Construct the HTTP \
User-Agent.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_HttpUserAgent.Append(g_szUAString, g_cchUAString);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- m_HttpUserAgent.Append(" \
(");</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ m_HttpUserAgent.Append(L" \
(");</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_HttpUserAgent.Append(m_UserAgent);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
m_HttpUserAgent.Append(")");</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
m_HttpUserAgent.Append(L")");</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // Pragma: version11-enabled \
header.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Pragma, L"version11-enabled=1" );</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -324,10 +324,13 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
(pSwitch[i].dwNewStreamNumber != CStreamSwitch::NO_STREAM))</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// Add this stream to the Stream Select string and count it.</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
if ( m_SSCount > 0 ) { m_SSEntry.AppendChar(' '); }</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
if ( m_SSCount > 0 ) </FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
\
m_SSEntry.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_SSEntry.Append(L"ffff:", 5);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_SSEntry.AppendUInt((unsigned int)(pSwitch[i].dwNewStreamNumber));</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
m_SSEntry.AppendChar(':');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
m_SSEntry.AppendChar(L':');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_SSEntry.AppendUInt((unsigned int)(pSwitch[i].dwModifier));</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_SSCount++;</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -647,13 +650,13 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
CWMSStringW strSSE;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
strSSE.Append(g_szPragmaStreamSwitchEntry);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
strSSE.AppendChar('=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
strSSE.AppendChar(L'=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
strSSE.Append(m_SSEntry);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Pragma, strSSE.PContents(), strSSE.GetLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
CWMSStringW strSSC;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
strSSC.Append(g_szPragmaStreamSwitchCount);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
strSSC.AppendChar('=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
strSSC.AppendChar(L'=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
strSSC.AppendInt(m_SSCount);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Pragma, strSSC.PContents(), strSSC.GetLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -683,7 +686,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
CWMSStringW str;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.Append(g_szPragmaPlaylistSeekId);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
str.AppendChar('=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
str.AppendChar(L'=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.AppendUInt(PPresDesc()->m_dwPlaylistGenId);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Pragma, str.PContents(), str.GetLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1673,7 +1676,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
CWMSStringW str;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.Append(g_szPragmaXClientGuid);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
str.AppendChar('=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
str.AppendChar(L'=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.Append(g_szGuidString);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Pragma, str.PContents(), str.GetLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1690,7 +1693,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.Append(m_Uri.Host(), m_Uri.HostLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if( \
m_Uri.Port() > 0 )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
str.AppendChar(':');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
str.AppendChar(L':');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.AppendUInt(m_Uri.Port());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Host, str.PContents(), str.GetLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1701,7 +1704,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
CWMSStringW str;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.Append(g_szPragmaClientId);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
str.AppendChar('=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
str.AppendChar(L'=');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
str.Append(m_ClientId.PContents());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pRequest->m_Headers.Add(g_Pragma, str.PContents(), str.GetLength());</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: HttpRequest.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/http/fileformat/HttpRequest.cpp,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.1.1.1</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.1.1.1 HttpRequest.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- HttpRequest.cpp 24 Jan \
2008 20:42:25 -0000 1.1.1.1</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ HttpRequest.cpp 22 Oct \
2008 19:12:30 -0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -830,15 +830,13 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // server is expecting FEC \
stream in format 0x0002nnnn</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> dw = \
(m_Switch.dwOldStreamNumber != 0xffffffff) ? (m_Switch.dwOldStreamNumber & \
0xfffff) : 0xffffffff;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt(dw);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">-</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> dw = \
(m_Switch.dwNewStreamNumber != 0xffffffff) ? (m_Switch.dwNewStreamNumber & \
0xfffff) : 0xffffffff;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt(dw);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">-</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt(m_Switch.dwModifier);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // add old stream \
name</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if(m_Switch.dwOldStreamNumber != 0xffffffff)</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -865,7 +863,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // \
separator between names</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if(fAddSep)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(p->m_StreamUrl.PContents(), p->m_StreamUrl.Length());</FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: HttpStreamFlowHeaders.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/http/fileformat/HttpStreamFlowHeaders.cpp,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.2</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.2 HttpStreamFlowHeaders.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- HttpStreamFlowHeaders.cpp 8 Apr 2008 \
18:33:25 -0000 1.2</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ HttpStreamFlowHeaders.cpp 22 Oct 2008 \
19:12:30 -0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -112,7 +112,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> case \
INetClient::RANGE_UNDEFINED:</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// No range defined. Default to stream the whole file.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(L"Pragma: \
rate=1.000,stream-offset=4294967295:4294967295,packet-num=4294967295,stream-time=0,max-duration=0");</FONT></P>
<P><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
Headers.Append(L"\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
break;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> case \
INetClient::RANGE_TO_TIME:</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -137,7 +137,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// Start offset is not set. Default to stream the whole file.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(L"Pragma: \
rate=1.000,stream-offset=4294967295:4294967295,packet-num=4294967295,stream-time=0,max-duration=0");</FONT></P>
<P><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
Headers.Append(L"\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
break;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> case \
INetClient::RANGE_TO_PACKET:</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -164,7 +164,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// Note: stream-time must be zero so that max-duration works properly.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(L"Pragma: \
rate=1.000,stream-offset=4294967295:4294967295,packet-num=0,stream-time=0,max-duration=0");</FONT></P>
<P><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
Headers.Append(L"\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
break;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> case \
INetClient::RANGE_TO_BYTE_OFFSET:</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -173,7 +173,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// Note: stream-time must be zero so that max-duration works properly.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(L"Pragma: \
rate=1.000,packet-num=4294967295,stream-time=0,stream-offset=");</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt64(s.StartOffset);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.AppendChar(':');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
Headers.AppendChar(L':');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if ( s.StopOffset != (QWORD)(-1) )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -181,7 +181,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
else</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.AppendChar('0');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.AppendChar(L'0');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// Unable to specify duration, so default to rest of clip.</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -193,7 +193,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
// Note: stream-time must be zero so that max-duration works properly.</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(L"Pragma: \
rate=1.000,stream-offset=0:0,packet-num=4294967295,stream-time=0,max-duration=0");</FONT></P>
<P><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
\
Headers.Append(L"\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
break;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> case \
INetClient::RANGE_CURRENT: // Not supported.</FONT> </P>
<P><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: common/inetrequest.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/inetrequest.h,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.5</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.5 inetrequest.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- \
common/inetrequest.h 8 Apr 2008 18:47:32 \
-0000 1.5</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ \
common/inetrequest.h 22 Oct 2008 19:40:14 \
-0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -432,7 +432,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> Headers.Append( \
L"\r\n", 2 );</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // allocate buffer</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- cchA = Headers.Length()*3;</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ cchA = Headers.Length()* \
sizeof(WCHAR) + 1;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
CHECKHR_RET(CNetBuffer::CreateInstance( cchA, &pBuffer ));</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: helix/helix_win32_functions.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.6</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.6 helix_win32_functions.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- \
helix/helix_win32_functions.h 7 Apr 2008 08:40:47 \
-0000 1.6</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ \
helix/helix_win32_functions.h 22 Oct 2008 \
19:40:14 -0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -227,7 +227,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // \
Convert the string to ANSI</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
HLXOsStrW strIn(lpWideCharStr, cchWideChar);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // \
Get the length (in chars of the string)</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- int lLen \
= strlen((const char*) strIn);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
int lLen = strIn.GetOutSize();</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // \
Compute the number of bytes to copy</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> int \
lCharsToCopy = lLen;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if \
(lCharsToCopy > cbMultiByte)</FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: include/wmsstring.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/include/wmsstring.h,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.4</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.4 wmsstring.h</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- include/wmsstring.h 17 Oct 2007 22:31:39 \
-0000 1.4</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ include/wmsstring.h 22 Oct 2008 19:40:14 \
-0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -303,9 +303,13 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> void CWMSStringT< T, Fixed, Chunk, \
OptAppend>::_init()</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> #ifdef _SYMBIAN</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
m_EmptyString[1] = 0;</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ m_EmptyString[0] = 0;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> #endif</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> m_hr = S_OK;</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ //Initializing m_FixedBuffer with \
ZEROs</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ memset(m_FixedBuffer, 0, \
sizeof(T) * Fixed);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> m_pBuffer = \
m_FixedBuffer;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> m_cBuffer = Fixed;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> m_cData = 0;</FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: rtsp/RtspClient.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/rtsp/RtspClient.cpp,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.8</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.8 RtspClient.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- rtsp/RtspClient.cpp 16 Apr 2008 15:24:45 \
-0000 1.8</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ rtsp/RtspClient.cpp 22 Oct 2008 19:40:15 \
-0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1931,11 +1931,11 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if( \
c == '\\' )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
pPres->m_BaseUrl.ReleaseBuffer(pPres->m_BaseUrl.Length()-1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
pPres->m_BaseUrl.AppendChar('/');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
pPres->m_BaseUrl.AppendChar(L'/');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> else \
if( c != '/' )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
pPres->m_BaseUrl.AppendChar('/');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
pPres->m_BaseUrl.AppendChar(L'/');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: rtsp/RtspRequest.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/rtsp/RtspRequest.cpp,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.3</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.3 RtspRequest.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- \
rtsp/RtspRequest.cpp 17 Oct 2007 22:44:22 \
-0000 1.3</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ \
rtsp/RtspRequest.cpp 22 Oct 2008 19:40:15 \
-0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -51,7 +51,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.Append(L"RTP/AVP/TCP;unicast;interleaved=");</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendUInt(Channel.Num);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Str.AppendChar('-');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Str.AppendChar(L'-');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendUInt(Channel.Num+1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> else if( MediaTransport == \
RTP_AVP_UDP || MediaTransport == RTP_AVP )</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -71,7 +71,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendUInt(Ports.Data);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if( Ports.Feedback != 0 )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Str.AppendChar('-');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Str.AppendChar(L'-');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendUInt(Ports.Feedback);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -79,7 +79,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if( Ssrc != 0 )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Str.Append(";ssrc=");</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Str.Append(L";ssrc=");</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendByte((BYTE)(Ssrc >> 24));</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendByte((BYTE)(Ssrc >> 16));</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -623,7 +623,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> HRESULT hr;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> Headers.Append( \
m_Verb.PContents(), m_Verb.Length() );</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar( L' ' \
);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> Headers.Append( \
m_Url.PContents(), m_Url.Length() );</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> Headers.Append( L" \
RTSP/1.0\r\n", 11 );</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1267,12 +1267,12 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_Output.Append(L"url=", 4);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if(fQuote)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
m_Output.AppendChar('"');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
m_Output.AppendChar(L'"');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> m_Output.Append(pszUrl, \
cchUrl);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if(fQuote)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
m_Output.AppendChar('"');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
m_Output.AppendChar(L'"');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> m_fAddSemiColon = \
TRUE;</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1283,7 +1283,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if(m_fAddSemiColon)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
m_Output.AppendChar(';');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
m_Output.AppendChar(L';');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
m_fAddSemiColon = FALSE;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1313,14 +1313,14 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> dw = \
(m_Switch.dwOldStreamNumber != 0xffffffff) ? (m_Switch.dwOldStreamNumber & \
0xfffff) : 0xffffffff;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt(dw);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> dw = \
(m_Switch.dwNewStreamNumber != 0xffffffff) ? (m_Switch.dwNewStreamNumber & \
0xfffff) : 0xffffffff;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt(dw);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt(m_Switch.dwModifier);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // add old stream \
name</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if(m_Switch.dwOldStreamNumber != 0xffffffff)</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -1347,7 +1347,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> // \
separator between names</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if(fAddSep)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.AppendChar(' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.AppendChar(L' ');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.Append(p->m_StreamUrl.PContents(), p->m_StreamUrl.Length());</FONT>
<BR><FONT SIZE=2 FACE="Verdana">Index: rtsp/RtspStreamFlowHeaders.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Verdana">RCS file: \
/cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/rtsp/RtspStreamFlowHeaders.cpp,v</FONT>
<BR><FONT SIZE=2 FACE="Verdana">retrieving revision 1.3</FONT>
<BR><FONT SIZE=2 FACE="Verdana">diff -u -b -r1.3 RtspStreamFlowHeaders.cpp</FONT>
<BR><FONT SIZE=2 FACE="Verdana">--- \
rtsp/RtspStreamFlowHeaders.cpp 26 Oct 2006 13:42:05 \
-0000 1.3</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+++ \
rtsp/RtspStreamFlowHeaders.cpp 22 Oct 2008 19:40:15 \
-0000</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -67,16 +67,16 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if(Sign < 0 && \
lVal != 0)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Str.AppendChar('-');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Str.AppendChar(L'-');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Str.AppendInt64(lHigh);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- Str.AppendChar('.');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ Str.AppendChar(L'.');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> if(lLow < 100)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> {</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Str.AppendChar('0');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Str.AppendChar(L'0');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if(lLow < 10)</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Str.AppendChar('0');</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Str.AppendChar(L'0');</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -127,7 +127,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
PrintPseudoFloat( Headers, s.StartOffset );</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("-", 1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.Append(L"-", 1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if( s.StopOffset != -1 )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -150,7 +150,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt64(s.StartOffset);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("-", 1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.Append(L"-", 1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if( s.StopOffset != -1 )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -174,7 +174,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
Headers.AppendUInt64( s.StartOffset );</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("-", 1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.Append(L"-", 1);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
if( s.StopOffset != -1 )</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
{</FONT>
<BR><FONT SIZE=2 FACE="Verdana">@@ -188,7 +188,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
return E_INVALIDARG;</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> \
}</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana">- \
Headers.Append("\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana">+ \
Headers.Append(L"\r\n", 2);</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> }</FONT>
<BR><FONT SIZE=2 FACE="Verdana"> </FONT>
<BR><FONT SIZE=2 FACE="Verdana"> return S_OK;</FONT>
</P>
<BR>
<P><FONT SIZE=2 FACE="Verdana">Regards</FONT>
<BR><FONT SIZE=2 FACE="Verdana">Girish</FONT>
</P>
</BODY>
</HTML>
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
--===============1834810481==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic