From jzeng at helixcommunity.org Tue Feb 1 08:48:05 2005
From: jzeng at helixcommunity.org (jzeng@helixcommunity.org)
Date: Tue Feb 1 08:41:54 2005
Subject: [Common-cvs] netio iresolv.cpp,1.20,1.20.2.1
Message-ID:
Update of /cvsroot/common/netio
In directory cvs-new:/tmp/cvs-serv15503
Modified Files:
Tag: SERVER_11_0_STABLE
iresolv.cpp
Log Message:
Synopsis
========
Fixes(partially) Bug 132409: Seneca CAs and guard failure when playing SDPGEN URLs with P900
Branches: head, server11
CR: Tom Marshall
Description
===========
This is a bug in query result parsing. If it contains more than one address for a host name, the
resolver will CA because of the incorrect parsing.
Index: iresolv.cpp
===================================================================
RCS file: /cvsroot/common/netio/iresolv.cpp,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- iresolv.cpp 17 Nov 2004 01:11:07 -0000 1.20
+++ iresolv.cpp 1 Feb 2005 16:48:03 -0000 1.20.2.1
@@ -402,6 +402,7 @@
// NB: this should be ~2.5k (40*64).
query_res resvec[MAX_RRCNT];
UINT32 rescnt = 0;
+ UINT32 hdrcnt = 0;
// Remove query for this qid only
m_pOwner->DelQuery(hdr.id, this);
@@ -423,14 +424,16 @@
// IPv4 addrs must be a multiple of 4
break;
}
- while (rescnt < MAX_RRCNT && rrhdr.rdlen)
+ hdrcnt = rrhdr.rdlen / 4;
+ while (rescnt < MAX_RRCNT && hdrcnt)
{
resvec[rescnt].a4.sin_family = AF_INET;
memcpy(&resvec[rescnt].a4.sin_addr, buf+pos, 4);
resvec[rescnt].a4.sin_port = 0;
- rrhdr.rdlen -= 4;
+ hdrcnt--;
++rescnt;
}
+ pos += rrhdr.rdlen;
break;
case RR_AAAA:
if (rrhdr.rdlen % 16 != 0)
@@ -438,14 +441,16 @@
// IPv6 addrs must be a multipe of 16
break;
}
- while (rescnt < MAX_RRCNT && rrhdr.rdlen)
+ hdrcnt = rrhdr.rdlen / 16;
+ while (rescnt < MAX_RRCNT && hdrcnt)
{
resvec[rescnt].a6.sin6_family = AF_INET6;
memcpy(&resvec[rescnt].a6.sin6_addr, buf+pos, 16);
resvec[rescnt].a6.sin6_port = 0;
- rrhdr.rdlen -= 16;
+ hdrcnt--;
++rescnt;
}
+ pos += rrhdr.rdlen;
break;
case RR_CNAME:
if (!DecodeName(szHost, buf, len, pos))
From jzeng at helixcommunity.org Tue Feb 1 08:50:49 2005
From: jzeng at helixcommunity.org (jzeng@helixcommunity.org)
Date: Tue Feb 1 08:44:47 2005
Subject: [Common-cvs] netio iresolv.cpp,1.21,1.22
Message-ID:
Update of /cvsroot/common/netio
In directory cvs-new:/tmp/cvs-serv17035
Modified Files:
iresolv.cpp
Log Message:
Synopsis
========
Fixes(partially) Bug 132409: Seneca CAs and guard failure when playing SDPGEN URLs with P900
Branches: head, server11
CR: Tom Marshall
Description
===========
This is a bug in query result parsing. If it contains more than one address for a host name, the
resolver will CA because of the incorrect parsing.
Index: iresolv.cpp
===================================================================
RCS file: /cvsroot/common/netio/iresolv.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- iresolv.cpp 21 Jan 2005 01:59:41 -0000 1.21
+++ iresolv.cpp 1 Feb 2005 16:50:47 -0000 1.22
@@ -403,6 +403,7 @@
// NB: this should be ~2.5k (40*64).
query_res resvec[MAX_RRCNT];
UINT32 rescnt = 0;
+ UINT32 hdrcnt = 0;
// Remove query for this qid only
m_pOwner->DelQuery(hdr.id, this);
@@ -424,14 +425,16 @@
// IPv4 addrs must be a multiple of 4
break;
}
- while (rescnt < MAX_RRCNT && rrhdr.rdlen)
+ hdrcnt = rrhdr.rdlen / 4;
+ while (rescnt < MAX_RRCNT && hdrcnt)
{
resvec[rescnt].a4.sin_family = AF_INET;
memcpy(&resvec[rescnt].a4.sin_addr, buf+pos, 4);
resvec[rescnt].a4.sin_port = 0;
- rrhdr.rdlen -= 4;
+ hdrcnt--;
++rescnt;
}
+ pos += rrhdr.rdlen;
break;
case RR_AAAA:
if (rrhdr.rdlen % 16 != 0)
@@ -439,14 +442,16 @@
// IPv6 addrs must be a multipe of 16
break;
}
- while (rescnt < MAX_RRCNT && rrhdr.rdlen)
+ hdrcnt = rrhdr.rdlen / 16;
+ while (rescnt < MAX_RRCNT && hdrcnt)
{
resvec[rescnt].a6.sin6_family = AF_INET6;
memcpy(&resvec[rescnt].a6.sin6_addr, buf+pos, 16);
resvec[rescnt].a6.sin6_port = 0;
- rrhdr.rdlen -= 16;
+ hdrcnt--;
++rescnt;
}
+ pos += rrhdr.rdlen;
break;
case RR_CNAME:
if (!DecodeName(szHost, buf, len, pos))
From liam_murray at helixcommunity.org Tue Feb 1 12:03:06 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Tue Feb 1 11:58:03 2005
Subject: [Common-cvs] netio symbian.pcf, NONE, 1.1 hxinetaddr.cpp, 1.1,
1.2 hxsockutil.cpp, 1.16, 1.17
Message-ID:
Update of /cvsroot/common/netio
In directory cvs-new:/tmp/cvs-serv11835
Modified Files:
hxinetaddr.cpp hxsockutil.cpp
Added Files:
symbian.pcf
Log Message:
Renamed pub/symbian/sockio.h to nettypes.h. Other files that need network related types include nettypes.h, not sockio.h.
Index: hxsockutil.cpp
===================================================================
RCS file: /cvsroot/common/netio/hxsockutil.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- hxsockutil.cpp 21 Jan 2005 01:27:32 -0000 1.16
+++ hxsockutil.cpp 1 Feb 2005 20:03:03 -0000 1.17
@@ -34,19 +34,20 @@
* ***** END LICENSE BLOCK ***** */
-#include "hxtypes.h"
-#include "sockio.h"
+#include "hxtypes.h"
+#include "nettypes.h"
#include "hxslist.h"
#include "hxbuffer.h"
#include "safestring.h"
#include "debug.h"
#include "hxassert.h"
#include "netbyte.h"
-#include "hxheap.h"
-#include "hxnet.h"
-#include "hxinetaddr.h"
+#include "hxheap.h"
+#include "hxnet.h"
+#include "hxinetaddr.h"
#include "hxsockutil.h"
-
+
+
#ifdef _DEBUG
#undef HX_THIS_FILE
static const char HX_THIS_FILE[] = __FILE__;
@@ -88,13 +89,15 @@
IHXSockAddr* pOther = ppAddrVec[idxSource];
if(familyOut == HX_SOCK_FAMILY_INANY || familyOut == pOther->GetFamily())
{
+ // no conversion needed (family matches) or family out is 'any'
ppAddrVecOut[idxOut] = ppAddrVec[idxSource];
HX_ASSERT(ppAddrVecOut[idxOut]);
ppAddrVecOut[idxOut]->AddRef();
++idxOut;
}
- else if(convert)
+ else if (convert)
{
+ // convert to family
HX_ASSERT(pNetServices);
IHXSockAddr* pAddr = 0;
HX_RESULT hrConvert = ConvertAddr(pNetServices, familyOut, pOther, pAddr);
@@ -254,6 +257,7 @@
{
if(pszAddr)
{
+ HX_ASSERT(*pszAddr);
IHXBuffer* pBuf;
CHXBuffer::FromCharArray(pszAddr, &pBuf);
pAddrOut->SetAddr(pBuf);
Index: hxinetaddr.cpp
===================================================================
RCS file: /cvsroot/common/netio/hxinetaddr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hxinetaddr.cpp 21 Jan 2005 01:23:47 -0000 1.1
+++ hxinetaddr.cpp 1 Feb 2005 20:03:03 -0000 1.2
@@ -33,8 +33,8 @@
*
* ***** END LICENSE BLOCK ***** */
-#include "hxtypes.h"
-#include "sockio.h"
+#include "hxtypes.h"
+#include "nettypes.h"
#include "hxnet.h"
#include "hxinetaddr.h"
#include "netbyte.h"
@@ -44,9 +44,9 @@
#ifdef _DEBUG
#undef HX_THIS_FILE
static const char HX_THIS_FILE[] = __FILE__;
-#endif
+#endif
+
-/*** Platform Glue ***/
static inline BOOL
isx(char c)
{
@@ -168,7 +168,7 @@
if (pos == 0)
{
return 0;
- }
+ }
d[elem] = hx_htons(n);
}
if (*s)
@@ -200,9 +200,7 @@
memmove(&d[8-(elem-celem)], &d[celem],
(elem-celem)*sizeof(UINT16));
}
-
memset(&d[celem], 0, (8-elem)*sizeof(UINT16));
-
}
else if(elem != 8)
{
@@ -355,7 +353,8 @@
strcpy(d, tmp);
return d;
}
-
+
+
UINT32
hx_htonl(UINT32 n)
{
--- NEW FILE: symbian.pcf ---
#
# ***** BEGIN LICENSE BLOCK *****
# Source last modified: $Id: symbian.pcf,v 1.1 2005/02/01 20:03:03 liam_murray Exp $
#
# Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
#
# The contents of this file, and the files included with this file,
# are subject to the current version of the RealNetworks Public
# Source License (the "RPSL") available at
# http://www.helixcommunity.org/content/rpsl unless you have licensed
# the file under the current version of the RealNetworks Community
# Source License (the "RCSL") available at
# http://www.helixcommunity.org/content/rcsl, in which case the RCSL
# will apply. You may also obtain the license terms directly from
# RealNetworks. You may not use this file except in compliance with
# the RPSL or, if you have a valid RCSL with RealNetworks applicable
# to this file, the RCSL. Please see the applicable RPSL or RCSL for
# the rights, obligations and limitations governing use of the
# contents of the file.
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL") in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your version of
# this file only under the terms of the GPL, and not to allow others
# to use your version of this file under the terms of either the RPSL
# or RCSL, indicate your decision by deleting the provisions above
# and replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient may
# use your version of this file under the terms of any one of the
# RPSL, the RCSL or the GPL.
#
# This file is part of the Helix DNA Technology. RealNetworks is the
# developer of the Original Code and owns the copyrights in the
# portions it created.
#
# This file, and the files included with this file, is distributed
# and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
# KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
# ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
# ENJOYMENT OR NON-INFRINGEMENT.
#
# Technology Compatibility Kit Test Suite(s) Location:
# http://www.helixcommunity.org/content/tck
#
# Contributor(s):
#
# ***** END LICENSE BLOCK *****
#
project.AddModuleIncludes('common/netio/pub/platform/symbian')
From liam_murray at helixcommunity.org Tue Feb 1 12:03:06 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Tue Feb 1 11:58:03 2005
Subject: [Common-cvs] netio/pub hxsockutil.h,1.11,1.12
Message-ID:
Update of /cvsroot/common/netio/pub
In directory cvs-new:/tmp/cvs-serv11835/pub
Modified Files:
hxsockutil.h
Log Message:
Renamed pub/symbian/sockio.h to nettypes.h. Other files that need network related types include nettypes.h, not sockio.h.
Index: hxsockutil.h
===================================================================
RCS file: /cvsroot/common/netio/pub/hxsockutil.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hxsockutil.h 6 Jan 2005 00:08:44 -0000 1.11
+++ hxsockutil.h 1 Feb 2005 20:03:04 -0000 1.12
@@ -20,7 +20,7 @@
UINT16 port /*net order*/ = 0);
static HX_RESULT CreateAddr(IHXNetServices* pServices, HXSockFamily family,
- const char* pszAddr, UINT16 port,
+ const char* pszAddr /*NULL = INANY*/, UINT16 port,
IHXSockAddr*& pAddrOut);
static HX_RESULT CreateAddrIN4(IHXNetServices* pNetServices,
From liam_murray at helixcommunity.org Tue Feb 1 12:03:07 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Tue Feb 1 11:58:04 2005
Subject: [Common-cvs] netio/pub/platform/symbian nettypes.h, NONE,
1.1 sockio.h, 1.4, NONE
Message-ID:
Update of /cvsroot/common/netio/pub/platform/symbian
In directory cvs-new:/tmp/cvs-serv11835/pub/platform/symbian
Added Files:
nettypes.h
Removed Files:
sockio.h
Log Message:
Renamed pub/symbian/sockio.h to nettypes.h. Other files that need network related types include nettypes.h, not sockio.h.
--- NEW FILE: nettypes.h ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: nettypes.h,v 1.1 2005/02/01 20:03:05 liam_murray Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef NETTYPES_H__
#define NETTYPES_H__
#include
#include
#include
#include
struct in6_addr
{
union
{
u_char Byte[16];
u_short Word[8];
} u;
};
#define INET6_ADDRSTRLEN KInetAddrMaxBits
#endif /* NETTYPES_H__ */
--- sockio.h DELETED ---
From liam_murray at helixcommunity.org Tue Feb 1 12:06:51 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Tue Feb 1 12:00:37 2005
Subject: [Common-cvs] runtime/pub/hlxclib errno.h,1.8,1.9
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs-new:/tmp/cvs-serv14653
Modified Files:
errno.h
Log Message:
Moved a couple of definitions from common/netio/pub/platfrom/symbian/sockio.h to here for consistency/better org.
Index: errno.h
===================================================================
RCS file: /cvsroot/common/runtime/pub/hlxclib/errno.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- errno.h 9 Jul 2004 18:21:09 -0000 1.8
+++ errno.h 1 Feb 2005 20:06:48 -0000 1.9
@@ -72,16 +72,15 @@
#endif /* defined(WIN32_PLATFORM_PSPC) */
-#ifdef _WIN32
+#if defined (_WIN32)
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINPROGRESS WSAEINPROGRESS
#endif /* _WIN32 */
#if defined(_SYMBIAN)
-#if defined(EAGAIN) && !defined(EWOULDBLOCK)
-#define EWOULDBLOCK EAGAIN
-#endif
-#endif /* _SYMBIAN */
+#define EWOULDBLOCK 1
+#define EINPROGRESS 2
+#endif /* _SYMBIAN */
#if defined(_OPENWAVE)
#ifndef EAGAIN
From rggammon at helixcommunity.org Tue Feb 1 17:45:20 2005
From: rggammon at helixcommunity.org (rggammon@helixcommunity.org)
Date: Tue Feb 1 17:39:05 2005
Subject: [Common-cvs] util hxthreadmessagesink.cpp,1.6,1.7
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv27746
Modified Files:
hxthreadmessagesink.cpp
Log Message:
#ifdef out HXThreadMessageSink::Create on non-windows
CR: liamm
Index: hxthreadmessagesink.cpp
===================================================================
RCS file: /cvsroot/common/util/hxthreadmessagesink.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hxthreadmessagesink.cpp 16 Nov 2004 01:29:50 -0000 1.6
+++ hxthreadmessagesink.cpp 2 Feb 2005 01:45:18 -0000 1.7
@@ -72,8 +72,13 @@
}
else
{
+#if defined(_WINDOWS)
// create instance for this thread
hr = HXThreadMessageSink::Create(pStored);
+#else
+ HX_ASSERT(false);
+ hr = HXR_NOTIMPL;
+#endif
if (SUCCEEDED(hr))
{
HXLOGL3(HXLOG_THRD, "HXThreadMessageSink::GetThreadInstance() created instance [%p]...", pStored);
From jeffl at helixcommunity.org Wed Feb 2 17:33:27 2005
From: jeffl at helixcommunity.org (jeffl@helixcommunity.org)
Date: Wed Feb 2 17:27:49 2005
Subject: [Common-cvs] util/platform/win hxwinthreadmessagesink.cpp, 1.10,
1.11
Message-ID:
Update of /cvsroot/common/util/platform/win
In directory cvs-new:/tmp/cvs-serv2203/platform/win
Modified Files:
hxwinthreadmessagesink.cpp
Log Message:
Checked in change to make sure that window class is unique for each dll that uses
this library code. The WindowProc needs to be valid in the address space of the dll
that uses this code.
Index: hxwinthreadmessagesink.cpp
===================================================================
RCS file: /cvsroot/common/util/platform/win/hxwinthreadmessagesink.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hxwinthreadmessagesink.cpp 24 Jan 2005 23:24:56 -0000 1.10
+++ hxwinthreadmessagesink.cpp 3 Feb 2005 01:33:25 -0000 1.11
@@ -133,7 +133,8 @@
HX_RESULT hr = HXR_FAIL;
- const char szClassName[] = "HelixMessageWindowClass";
+ CHXString strClassName = "HelixMessageWindowClass";
+ strClassName.AppendULONG((ULONG32) &WindowProc);
DWORD tid = ::GetCurrentThreadId();
CHXString windowName = "HelixMessageWindow[";
@@ -149,7 +150,7 @@
wndClass.lpfnWndProc = WindowProc;
wndClass.cbWndExtra = sizeof(this);
wndClass.hInstance = hModule;
- wndClass.lpszClassName = szClassName;
+ wndClass.lpszClassName = strClassName;
// ensure class is registered
ATOM atom = ::RegisterClass(&wndClass);
@@ -161,7 +162,7 @@
// create an instance of the window
HX_ASSERT(!m_handle);
- m_handle = ::CreateWindow(szClassName, windowName,
+ m_handle = ::CreateWindow(strClassName, windowName,
WS_OVERLAPPED, 0, 0, 0, 0, NULL, NULL, hModule, NULL);
HX_ASSERT(m_handle);
From bobclark at helixcommunity.org Thu Feb 3 06:23:13 2005
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Thu Feb 3 06:17:50 2005
Subject: [Common-cvs] include hxpreftr.h,1.7,1.8
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv5930
Modified Files:
hxpreftr.h
Log Message:
add AbortTransport and TransportAborted to handle preferred-transport logic when redirects are happening; cr ping
Index: hxpreftr.h
===================================================================
RCS file: /cvsroot/common/include/hxpreftr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hxpreftr.h 4 Aug 2004 17:22:44 -0000 1.7
+++ hxpreftr.h 3 Feb 2005 14:23:08 -0000 1.8
@@ -224,6 +224,8 @@
STDMETHOD(RemoveTransport) (THIS) PURE;
+ STDMETHOD(AbortTransport) (THIS) PURE;
+
STDMETHOD(AddTransportSink) (IHXPreferredTransportSink* /* IN */ pPrefTransportSink) PURE;
STDMETHOD(RemoveTransportSink) (IHXPreferredTransportSink* /* IN */ pPrefTransportSink) PURE;
@@ -277,6 +279,8 @@
UINT16 /* IN */ uCloakPort) PURE;
STDMETHOD(TransportFailed) (THIS) PURE;
+
+ STDMETHOD(TransportAborted) (THIS) PURE;
};
#endif /* _HXPREFTR_H_ */
From bobclark at helixcommunity.org Thu Feb 3 11:43:54 2005
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Thu Feb 3 11:37:49 2005
Subject: [Common-cvs] util hxurl.cpp,1.36,1.37
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv1852
Modified Files:
hxurl.cpp
Log Message:
fix two minor glitches that were preventing some alt urls from working; cr ehodge
Index: hxurl.cpp
===================================================================
RCS file: /cvsroot/common/util/hxurl.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- hxurl.cpp 13 Jan 2005 20:45:34 -0000 1.36
+++ hxurl.cpp 3 Feb 2005 19:43:51 -0000 1.37
@@ -552,7 +552,6 @@
if (HXR_OK == m_LastError)
{
-
IHXBuffer* pBuf = 0;
// retrieve Alt-URL if it exists in the option list
if (HXR_OK == m_pOptions->GetPropertyBuffer("altURL", pBuf) && pBuf)
@@ -570,9 +569,8 @@
// use default alt-url form
bDefault = TRUE;
- HXURLRep url(HXURLRep::TYPE_NETPATH, "http", m_url.Host(), -1, "");
+ HXURLRep url(HXURLRep::TYPE_NETPATH, "http", m_url.Host(), -1, m_url.Path());
HX_ASSERT(url.IsValid());
- char* pAltURL = 0;
::StrAllocCopy(pAltURL, url.String());
}
}
From bobclark at helixcommunity.org Thu Feb 3 13:42:50 2005
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Thu Feb 3 13:36:21 2005
Subject: [Common-cvs] util hxurl.cpp,1.37,1.38
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv29812
Modified Files:
hxurl.cpp
Log Message:
build full url, including query and fragment, when constructing alternate url; cr acolwell
Index: hxurl.cpp
===================================================================
RCS file: /cvsroot/common/util/hxurl.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- hxurl.cpp 3 Feb 2005 19:43:51 -0000 1.37
+++ hxurl.cpp 3 Feb 2005 21:42:48 -0000 1.38
@@ -569,7 +569,9 @@
// use default alt-url form
bDefault = TRUE;
- HXURLRep url(HXURLRep::TYPE_NETPATH, "http", m_url.Host(), -1, m_url.Path());
+ HXURLRep url(HXURLRep::TYPE_NETPATH, "http", "", // no user info
+ m_url.Host(), -1, m_url.Path(), m_url.Query(), m_url.Fragment());
+
HX_ASSERT(url.IsValid());
::StrAllocCopy(pAltURL, url.String());
}
From anandv at helixcommunity.org Thu Feb 3 18:41:24 2005
From: anandv at helixcommunity.org (anandv@helixcommunity.org)
Date: Thu Feb 3 18:34:53 2005
Subject: [Common-cvs] CVSROOT avail,1.16,1.17
Message-ID:
Update of /cvsroot/common/CVSROOT
In directory cvs-new:/tmp/cvs-serv6224/CVSROOT
Modified Files:
avail
Log Message:
giving gstacey write access for the 'common' project
Index: avail
===================================================================
RCS file: /cvsroot/common/CVSROOT/avail,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- avail 27 Jan 2005 23:24:21 -0000 1.16
+++ avail 4 Feb 2005 02:41:21 -0000 1.17
@@ -55,6 +55,7 @@
avail|ghori
avail|glomph
avail|grobbins
+avail|gstacey
avail|gwright
avail|hboone
avail|hfrederickson
From sehancher at helixcommunity.org Fri Feb 4 16:18:47 2005
From: sehancher at helixcommunity.org (sehancher@helixcommunity.org)
Date: Fri Feb 4 16:20:44 2005
Subject: [Common-cvs] util/platform/mac mac_pref_cf.cpp,1.7.30.1,1.7.30.2
Message-ID:
Update of /cvsroot/common/util/platform/mac
In directory cvs-new:/tmp/cvs-serv26945
Modified Files:
Tag: hxclient_1_2_2_neptune
mac_pref_cf.cpp
Log Message:
Do not assume that the current application is a Bundle when looking for a preference filename.
Index: mac_pref_cf.cpp
===================================================================
RCS file: /cvsroot/common/util/platform/mac/mac_pref_cf.cpp,v
retrieving revision 1.7.30.1
retrieving revision 1.7.30.2
diff -u -d -r1.7.30.1 -r1.7.30.2
--- mac_pref_cf.cpp 28 Sep 2004 18:02:06 -0000 1.7.30.1
+++ mac_pref_cf.cpp 5 Feb 2005 00:18:45 -0000 1.7.30.2
@@ -68,24 +68,7 @@
// Added support for overloading the preference file name.
// If the HelixPreferenceFileID preferences exists in the main bundle's pref's, then use its value as the pref. filename.
- CFBundleRef mainBundleRef = NULL;
- CFStringRef mainBundleID = NULL;
- CFStringRef helixPrefFileID = NULL;
-
- mainBundleRef = CFBundleGetMainBundle();
-
- if (mainBundleRef)
- {
- // if previous step succeeded (failure possible with CFM app)
- mainBundleID = CFBundleGetIdentifier( mainBundleRef );
- }
-
- if (mainBundleID)
- {
- // if previous step succeeded
- helixPrefFileID = ( CFStringRef ) CFPreferencesCopyAppValue( CFSTR( "HelixPreferenceFileID" ), mainBundleID );
- }
-
+ CFStringRef helixPrefFileID = ( CFStringRef ) CFPreferencesCopyAppValue( CFSTR( "HelixPreferenceFileID" ), kCFPreferencesCurrentApplication );
if ( helixPrefFileID )
{
// Support mapping of helix product names to application specific values.
From sehancher at helixcommunity.org Fri Feb 4 16:21:28 2005
From: sehancher at helixcommunity.org (sehancher@helixcommunity.org)
Date: Fri Feb 4 16:20:45 2005
Subject: [Common-cvs] util/platform/mac mac_pref_cf.cpp,1.7.16.1,1.7.16.2
Message-ID:
Update of /cvsroot/common/util/platform/mac
In directory cvs-new:/tmp/cvs-serv30070
Modified Files:
Tag: hxclient_1_1_6_neptune
mac_pref_cf.cpp
Log Message:
Do not assume that the current application is a Bundle when looking for a preference filename.
Index: mac_pref_cf.cpp
===================================================================
RCS file: /cvsroot/common/util/platform/mac/mac_pref_cf.cpp,v
retrieving revision 1.7.16.1
retrieving revision 1.7.16.2
diff -u -d -r1.7.16.1 -r1.7.16.2
--- mac_pref_cf.cpp 29 Sep 2004 22:47:27 -0000 1.7.16.1
+++ mac_pref_cf.cpp 5 Feb 2005 00:21:25 -0000 1.7.16.2
@@ -68,24 +68,7 @@
// Added support for overloading the preference file name.
// If the HelixPreferenceFileID preferences exists in the main bundle's pref's, then use its value as the pref. filename.
- CFBundleRef mainBundleRef = NULL;
- CFStringRef mainBundleID = NULL;
- CFStringRef helixPrefFileID = NULL;
-
- mainBundleRef = CFBundleGetMainBundle();
-
- if (mainBundleRef)
- {
- // if previous step succeeded (failure possible with CFM app)
- mainBundleID = CFBundleGetIdentifier( mainBundleRef );
- }
-
- if (mainBundleID)
- {
- // if previous step succeeded
- helixPrefFileID = ( CFStringRef ) CFPreferencesCopyAppValue( CFSTR( "HelixPreferenceFileID" ), mainBundleID );
- }
-
+ CFStringRef helixPrefFileID = ( CFStringRef ) CFPreferencesCopyAppValue( CFSTR( "HelixPreferenceFileID" ), kCFPreferencesCurrentApplication );
if ( helixPrefFileID )
{
// Support mapping of helix product names to application specific values.
From pankajgupta at helixcommunity.org Fri Feb 4 17:57:43 2005
From: pankajgupta at helixcommunity.org (pankajgupta@helixcommunity.org)
Date: Fri Feb 4 17:51:05 2005
Subject: [Common-cvs] build/BIF helix.bif,1.498,1.499
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv8337
Modified Files:
helix.bif
Log Message:
imagemap renderer removed for symbian
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -d -r1.498 -r1.499
--- helix.bif 19 Jan 2005 17:53:47 -0000 1.498
+++ helix.bif 5 Feb 2005 01:57:41 -0000 1.499
@@ -4161,6 +4161,10 @@
+
+
+ symbian
+
common_include
From pankajgupta at helixcommunity.org Mon Feb 7 10:10:14 2005
From: pankajgupta at helixcommunity.org (pankajgupta@helixcommunity.org)
Date: Mon Feb 7 10:03:14 2005
Subject: [Common-cvs] build/BIF helix.bif,1.499,1.500
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv12236
Modified Files:
helix.bif
Log Message:
common_netio updated to include it in symbian platform build
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -d -r1.499 -r1.500
--- helix.bif 5 Feb 2005 01:57:41 -0000 1.499
+++ helix.bif 7 Feb 2005 18:10:12 -0000 1.500
@@ -123,7 +123,7 @@
- unix mac win32 tm1 wince
+ unix mac win32 tm1 wince symbian
helix-client-local-ra-rv-mp3
From gwright at helixcommunity.org Fri Feb 11 09:35:56 2005
From: gwright at helixcommunity.org (gwright@helixcommunity.org)
Date: Fri Feb 11 09:28:26 2005
Subject: [Common-cvs] build/BIF helix.bif,1.500,1.501
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv13984
Modified Files:
helix.bif
Log Message:
Fixing symbian HEAD builds.
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -d -r1.500 -r1.501
--- helix.bif 7 Feb 2005 18:10:12 -0000 1.500
+++ helix.bif 11 Feb 2005 17:35:53 -0000 1.501
@@ -2721,10 +2721,6 @@
-
- symbian
-
-
From pankajgupta at helixcommunity.org Fri Feb 11 11:46:02 2005
From: pankajgupta at helixcommunity.org (pankajgupta@helixcommunity.org)
Date: Fri Feb 11 11:38:31 2005
Subject: [Common-cvs] fileio symbian.pcf,1.8,1.9
Message-ID:
Update of /cvsroot/common/fileio
In directory cvs-new:/tmp/cvs-serv22362
Modified Files:
symbian.pcf
Log Message:
platform/symbian/symbchxdataf.cpp excluded if HEliX_CONFIG_STDIO defined
Index: symbian.pcf
===================================================================
RCS file: /cvsroot/common/fileio/symbian.pcf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- symbian.pcf 21 Jan 2005 01:20:42 -0000 1.8
+++ symbian.pcf 11 Feb 2005 19:46:00 -0000 1.9
@@ -49,8 +49,6 @@
# ***** END LICENSE BLOCK *****
#
-project.AddDefines("HELIX_CONFIG_STDIO")
-
project.AddIncludes('pub/platform/symbian',
'platform/symbian')
project.AddModuleIncludes('common/include/platform/symbian')
@@ -59,8 +57,8 @@
'platform/win/filespec.cpp',
'platform/symbian/filespecutils.cpp',
'platform/symbian/symbianff.cpp',
+ 'platform/symbian/symbihxdataf.cpp',
'platform/symbian/symbhxdir.cpp'
)
-
-project.AddSources('platform/symbian/symbihxdataf.cpp',
- 'platform/symbian/symbchxdataf.cpp')
+if not project.IsDefined('HELIX_CONFIG_STDIO'):
+ project.AddSources('platform/symbian/symbchxdataf.cpp')
From milko at helixcommunity.org Mon Feb 14 07:09:17 2005
From: milko at helixcommunity.org (milko@helixcommunity.org)
Date: Mon Feb 14 07:09:35 2005
Subject: [Common-cvs] include ihxtlogsystem.h,1.10,1.11
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv27120
Modified Files:
ihxtlogsystem.h
Log Message:
Added AACF logging category.
Index: ihxtlogsystem.h
===================================================================
RCS file: /cvsroot/common/include/ihxtlogsystem.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ihxtlogsystem.h 12 Jan 2005 18:25:08 -0000 1.10
+++ ihxtlogsystem.h 14 Feb 2005 15:09:15 -0000 1.11
@@ -134,6 +134,7 @@
PUB,
// Client-related functional areas (in alphabetical order)
+ HXLOG_AACF = HX_MAKE4CC('A','A','C','F'), // AAC File Format
HXLOG_ADEV = HX_MAKE4CC('A','D','E','V'), // Audio device
HXLOG_ASMX = HX_MAKE4CC('A','S','M','X'), // ASM
HXLOG_AUDI = HX_MAKE4CC('A','U','D','I'), // RealAudio
From milko at helixcommunity.org Mon Feb 14 07:11:45 2005
From: milko at helixcommunity.org (milko@helixcommunity.org)
Date: Mon Feb 14 07:12:02 2005
Subject: [Common-cvs] build/BIF helix.bif,1.501,1.502
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv29411
Modified Files:
helix.bif
Log Message:
Added dependency on logging utility to aac file format moule.
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -d -r1.501 -r1.502
--- helix.bif 11 Feb 2005 17:35:53 -0000 1.501
+++ helix.bif 14 Feb 2005 15:11:42 -0000 1.502
@@ -2867,6 +2867,7 @@
common_dbgtool
common_util
common_system
+ common_log_logutil
datatype_aac_payload
datatype_dist_rm_audio_common
protocol_common_util
From liam_murray at helixcommunity.org Wed Feb 16 11:48:12 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Wed Feb 16 11:48:13 2005
Subject: [Common-cvs] util hxtaskmanager.cpp,1.5,1.6
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv20656
Modified Files:
hxtaskmanager.cpp
Log Message:
added lock to pending task queue during cleanup; some other cleanup
Index: hxtaskmanager.cpp
===================================================================
RCS file: /cvsroot/common/util/hxtaskmanager.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hxtaskmanager.cpp 17 Dec 2004 20:21:37 -0000 1.5
+++ hxtaskmanager.cpp 16 Feb 2005 19:48:09 -0000 1.6
@@ -115,31 +115,34 @@
// clean up task thread and sync objects
DestroyPool();
HX_DELETE(m_pWorkEvent);
- HX_DELETE(m_pTaskMutex);
-
- // clean up any outstanding tasks
- CHXSimpleList::Iterator end = m_pending.End();
- for(CHXSimpleList::Iterator begin = m_pending.Begin(); begin != end; ++begin)
+ if (m_pTaskMutex)
{
- Task* pTask = reinterpret_cast(*begin);
- pTask->OnTaskComplete(HXR_ABORT);
- pTask->Release();
+ // clean up outstanding tasks
+ HXScopeLock lock(m_pTaskMutex);
+ CHXSimpleList::Iterator end = m_pending.End();
+ for(CHXSimpleList::Iterator iter = m_pending.Begin(); iter != end; ++iter)
+ {
+ Task* pTask = reinterpret_cast(*iter);
+ HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::~HXTaskManager(): aborting task [%p]", this, pTask);
+ pTask->OnTaskComplete(HXR_ABORT);
+ pTask->Release();
+ }
+ m_pending.RemoveAll();
}
- m_pending.RemoveAll();
+ HX_DELETE(m_pTaskMutex);
+ HX_ASSERT(m_pending.IsEmpty());
- {
// un-register with sinks
CHXSet::Iterator end = m_sinks.End();
- for(CHXSet::Iterator begin = m_sinks.Begin(); begin != end; ++begin)
+ for(CHXSet::Iterator iter = m_sinks.Begin(); iter != end; ++iter)
{
- HXThreadMessageSink* pSink = reinterpret_cast(*begin);
+ HXThreadMessageSink* pSink = reinterpret_cast(*iter);
HX_ASSERT(pSink);
HX_ASSERT(pSink->IsHandled(m_taskDoneMsg));
pSink->RemoveHandler(m_taskDoneMsg);
HX_RELEASE(pSink);
}
m_sinks.RemoveAll();
- }
}
HX_RESULT HXTaskManager::Init(UINT32 threadCount, UINT32 threadPriority)
@@ -195,62 +198,64 @@
HX_RESULT HXTaskManager::AddTask(Task* pTask)
{
- HXThread* pTmp = NULL;
- HX_RESULT hr = HXR_FAIL;
- HXThreadMessageSink* pMsgSink = NULL;
-
HX_ASSERT(m_threads.GetCount() > 0);
HX_ASSERT(pTask);
- hr = HXThreadMessageSink::GetThreadInstance(pMsgSink);
+ HXThreadMessageSink* pMsgSink = NULL;
+ HX_RESULT hr = HXThreadMessageSink::GetThreadInstance(pMsgSink);
+ if (FAILED(hr))
+ {
+ HX_ASSERT(false);
+ return hr;
+ }
+
+ if( !pMsgSink->IsHandled(m_taskDoneMsg) )
+ {
+ // register with message sink in order to handle
+ // task done messages sent to response thread
+ hr = pMsgSink->AddHandler(m_taskDoneMsg, this);
+ HX_ASSERT(SUCCEEDED(hr));
+ if (SUCCEEDED(hr))
+ {
+ // keep track of sinks that we have registered with
+ HX_ASSERT(!m_sinks.Lookup(pMsgSink));
+ pMsgSink->AddRef();
+ m_sinks.Add(pMsgSink);
+ }
+ }
+
+ HX_ASSERT(m_sinks.Lookup(pMsgSink));
+
if (SUCCEEDED(hr))
{
- if( !pMsgSink->IsHandled(m_taskDoneMsg) )
+ pTask->AddRef();
+ if (!pTask->GetResponseThread())
{
- // register with message sink in order to handle
- // task done messages sent to response thread
- hr = pMsgSink->AddHandler(m_taskDoneMsg, this);
+ HXThread* pResponseThread = NULL;
+ hr = HXThread::MakeThread(pResponseThread);
HX_ASSERT(SUCCEEDED(hr));
-
- if (SUCCEEDED(hr))
+ if (SUCCEEDED(hr) )
{
- // keep track of sinks that we have registered with
- HX_ASSERT(!m_sinks.Lookup(pMsgSink));
- pMsgSink->AddRef();
- m_sinks.Add(pMsgSink);
+ // transfer ownership of thread
+ pTask->SetResponseThread(pResponseThread);
}
}
- HX_ASSERT(m_sinks.Lookup(pMsgSink));
+
+ pTask->SetMessageSink(pMsgSink);
- if (SUCCEEDED(hr))
+ // add to pending task list and tell a task thread to start working
+ HXScopeLock lock(m_pTaskMutex);
+ HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::AddTask(): adding task #%lu", this, m_pending.GetCount());
+ m_pending.AddTail(pTask);
+
+ // XXXLCM use a semaphore instead; more appropriate
+ if (m_pending.GetCount() == 1)
{
- // and add to pending task list and tell a task thread to start working
- HXScopeLock lock(m_pTaskMutex);
- HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::AddTask(): adding task #%lu", this, m_pending.GetCount());
-
- pTask->AddRef();
- if (!pTask->GetResponseThread())
- {
- hr = HXThread::MakeThread(pTmp);
- HX_ASSERT(SUCCEEDED(hr));
- if( pTmp && SUCCEEDED(hr) )
- {
- pTask->SetResponseThread(pTmp);
- }
- }
-
- pTask->SetMessageSink(pMsgSink);
- m_pending.AddTail(pTask);
-
- // XXXLCM use a semaphore instead; more appropriate
- if (m_pending.GetCount() == 1)
- {
- m_pWorkEvent->SignalEvent();
- }
+ m_pWorkEvent->SignalEvent();
}
- HX_RELEASE(pMsgSink);
}
-
+ HX_RELEASE(pMsgSink);
+
return hr;
}
@@ -315,9 +320,9 @@
CHXSet::Iterator end = m_threads.End();
for(CHXSet::Iterator begin = m_threads.Begin(); begin != end; ++begin)
{
- // wait for thread to exit gracefully
+ // wait for thread to exit gracefully
HXThread* pThread = reinterpret_cast(*begin);
- pThread->Exit(0);
+ pThread->Exit(0); //XXXLCM we probably should kill after timeout
HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::DestroyPool(): thread [%p] exited", this, pThread);
HX_DELETE(pThread);
@@ -356,12 +361,7 @@
}
void* HXTaskManager::TaskThreadProc()
{
-
- HXThreadMessageSink* pMsgSink = NULL;
- HXThread* pResponseThread = NULL;
- Task* pTask = NULL;
-
- for( ; ; )
+ for ( ; ; )
{
HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::TaskThreadProc(): waiting for work event...", this);
@@ -370,23 +370,23 @@
HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::TaskThreadProc(): got work event...", this);
- if(m_exit)
+ if (m_exit)
{
HXLOGL3(HXLOG_THRD, "HXTaskManager[%p]::TaskThreadProc(): exiting...", this);
break;
}
// fetch and execute next task
- pTask = GetNextTask();
- if(pTask)
+ Task* pTask = GetNextTask();
+ if (pTask)
{
pTask->Execute();
- pResponseThread = pTask->GetResponseThread();
- pMsgSink = pTask->GetMessageSink();
- HX_ASSERT(pResponseThread && pMsgSink);
+ HXThread* pResponseThread = pTask->GetResponseThread();
+ HXThreadMessageSink* pMsgSink = pTask->GetMessageSink();
- if( pResponseThread && pMsgSink )
+ HX_ASSERT(pResponseThread && pMsgSink);
+ if (pResponseThread && pMsgSink)
{
// post response to (response) thread
HXThreadMessage msgResponse(m_taskDoneMsg, pTask, 0);
From vijshetty at helixcommunity.org Thu Feb 17 12:24:42 2005
From: vijshetty at helixcommunity.org (vijshetty@helixcommunity.org)
Date: Thu Feb 17 12:24:35 2005
Subject: [Common-cvs] include hxstreamadapt.h,1.5.2.1,1.5.2.2
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv2233
Modified Files:
Tag: SERVER_11_0_STABLE
hxstreamadapt.h
Log Message:
Synopsis
========
- fix Bug 130657: BLOCKER: Helix Rate Adaptation: Server doesn't validate or gracefully handle invalid target-time or size parameters
- Aggregate buffer management for Helix-Adaptation
- use target-time as the High water mark
Description
===========
1.> fix Bug 130657: BLOCKER: Helix Rate Adaptation: Server doesn't validate or gracefully handle invalid target-time or size parameters
Buffer verifier now validates Low and High Water mark. There was also a bug in how high water mark was calculated for session using Rel6/Helix-Adaptation. The low water mark calculations was based on the target-time but the high water mark was still calculated using Pre-roll as in Rel5. This was rectified by making High water mark calculations dependent on target-time for sessions that use Rel6/Helix-Adapt.
2.> Aggregate buffer management for Helix-Adaptation
Rate Manager changed to maintain an aggregate buffer ( sum of buffer sizes, max pre-roll, max target-time) for clients that signal Helix Adaptation.
Rationale:
The original Helix-Adaptation implementation maintains separate buffer for each stream and the aggregstion is provided while Rate Shifting. An aggregate level shift does not consider the stream that initiated the Rate Shift request. A downshift requested by the audio stream could end up providing a stream group that has the same media rate for audio but a lower one for video.
Under such circumstances the buffer condition that caused a shift is still not rectified and the buffer based keeps generating rate shift messages. Maintaining the buffer resources in a stream unaware (aggregate) fashion is better suited to deal with aggreaget rate shifts.
3.> use Target-Time as the High Water Mark
Helix player buffer is set to a size that is enough to hold target-time at maximum bit-rate. The target-time is set as twice the pre-roll. Assuming the server uses target-time as being the low water mark, after pre-roll the server has pre-roll worth of time to send 2*pre-roll data to satisfy the low water mark requirement. this in turn requires Congestion control to send data at twice the rate. This usually leads to situations immediately after pre-roll when the buffer is below the low water mark for quiet some time and it initiates a sequence of downshifts till the lowest media rates are selected.
A better approach would be to set Low water mark to Pre-Roll+DELTA, where delta is a fraction of pre-roll, and Target-time as the High water mark. Under these settings when the buffer satisfies pre-roll we can, given the current throughput and media rate, determine if the buffer would be growing towards target-time and if it does then avoid downshifts if Low water mark is greater than pre-roll.
This approach is a step towards the more elaborate buffer modelling that have been discussed in the recent meetings. This approach borrows from Aaron's suggestion of making target-time as the High water mark and Jason and Go's idea of using an estimated buffer growth to determine if we need to initiate a rate shift.
Files Affected
==============
common/include/hxstreamadapt.h
server_rn/qos/session/qos_sess_annexgbuf_verify.cpp
server_rn/qos/session/qos_sess_buffinfocollect.cpp
server_rn/qos/session/qos_sess_pktqueue.cpp
server_rn/qos/session/qos_sess_qosratemgr.cpp
server_rn/qos/session/pub/qos_sess_annexgbuf_verify.h
server_rn/qos/session/pub/qos_sess_buffinfocollect.h
server_rn/qos/session/pub/qos_sess_buffupdate.h
server_rn/qos/session/pub/qos_sess_pktqueue.h
server_rn/qos/session/pub/qos_sess_qosratemgr.h
server/engine/dataflow/static_pushpktflow.cpp
server/engine/dataflow/pub/static_pushpktflow.h
server/engine/session/player.cpp
server/engine/session/pub/player.h
server/qos/session/pub/qos_sess_cbr_ratemgr.h
Reviewed by: Go Hori
Index: hxstreamadapt.h
===================================================================
RCS file: /cvsroot/common/include/hxstreamadapt.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- hxstreamadapt.h 6 Dec 2004 01:11:11 -0000 1.5.2.1
+++ hxstreamadapt.h 17 Feb 2005 20:24:40 -0000 1.5.2.2
@@ -14,6 +14,36 @@
ADAPTATION_NONE
} StreamAdaptationSchemeEnum;
+
+#ifndef MDP_STREAM_ADAPT_HELPER_FUNC
+#define MDP_STREAM_ADAPT_HELPER_FUNC
+inline BOOL IsHelixStreamAdaptScheme(StreamAdaptationSchemeEnum enumStreamAdaptScheme)
+{
+ switch (enumStreamAdaptScheme)
+ {
+ case ADAPTATION_HLX_AGGR:
+ case ADAPTATION_HLX_PER_STREAM:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
+inline BOOL IsRel6StyleStreamAdaptScheme(StreamAdaptationSchemeEnum enumStreamAdaptScheme)
+{
+ switch (enumStreamAdaptScheme)
+ {
+ case ADAPTATION_HLX_AGGR:
+ case ADAPTATION_HLX_PER_STREAM:
+ case ADAPTATION_REL6_PER_STREAM:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+#endif
+
+
typedef struct _StreamAdaptationParams
{
_StreamAdaptationParams() : m_unStreamNum(0xFFFF)
@@ -23,6 +53,7 @@
, m_bStreamSwitch(FALSE)
, m_bBufferStateAvailable(FALSE)
, m_ulNumExcludedRules(0)
+ , m_ulMaxPreRoll(0)
{
}
@@ -36,6 +67,8 @@
BOOL m_bBufferStateAvailable; //true indicates client buffer feedback is available
UINT32 m_ulNumExcludedRules; // Number of excluded rules in m_pExcludeRules
UINT16 m_pExcludeRules [MAX_EXCLUDE_RULES]; //vector of rules to be excluded from adaptation
+
+ UINT32 m_ulMaxPreRoll; // Used for Aggregate Buffer Manangement (Helix-Adapt)
} StreamAdaptationParams;
typedef struct _LinkCharParams
From vijshetty at helixcommunity.org Thu Feb 17 13:53:18 2005
From: vijshetty at helixcommunity.org (vijshetty@helixcommunity.org)
Date: Thu Feb 17 13:53:10 2005
Subject: [Common-cvs] include hxstreamadapt.h,1.6,1.7
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv9951
Modified Files:
hxstreamadapt.h
Log Message:
merged from SERVER_11_0_STABLE
Synopsis
========
- fix Bug 130657: BLOCKER: Helix Rate Adaptation: Server doesn't validate or gracefully handle invalid target-time or size parameters
- Aggregate buffer management for Helix-Adaptation
- use target-time as the High water mark
Description
===========
1.> fix Bug 130657: BLOCKER: Helix Rate Adaptation: Server doesn't validate or gracefully handle invalid target-time or size parameters
Buffer verifier now validates Low and High Water mark. There was also a bug in how high water mark was calculated for session using Rel6/Helix-Adaptation. The low water mark calculations was based on the target-time but the high water mark was still calculated using Pre-roll as in Rel5. This was rectified by making High water mark calculations dependent on target-time for sessions that use Rel6/Helix-Adapt.
2.> Aggregate buffer management for Helix-Adaptation
Rate Manager changed to maintain an aggregate buffer ( sum of buffer sizes, max pre-roll, max target-time) for clients that signal Helix Adaptation.
Rationale:
The original Helix-Adaptation implementation maintains separate buffer for each stream and the aggregstion is provided while Rate Shifting. An aggregate level shift does not consider the stream that initiated the Rate Shift request. A downshift requested by the audio stream could end up providing a stream group that has the same media rate for audio but a lower one for video.
Under such circumstances the buffer condition that caused a shift is still not rectified and the buffer based keeps generating rate shift messages. Maintaining the buffer resources in a stream unaware (aggregate) fashion is better suited to deal with aggreaget rate shifts.
3.> use Target-Time as the High Water Mark
Helix player buffer is set to a size that is enough to hold target-time at maximum bit-rate. The target-time is set as twice the pre-roll. Assuming the server uses target-time as being the low water mark, after pre-roll the server has pre-roll worth of time to send 2*pre-roll data to satisfy the low water mark requirement. this in turn requires Congestion control to send data at twice the rate. This usually leads to situations immediately after pre-roll when the buffer is below the low water mark for quiet some time and it initiates a sequence of downshifts till the lowest media rates are selected.
A better approach would be to set Low water mark to Pre-Roll+DELTA, where delta is a fraction of pre-roll, and Target-time as the High water mark. Under these settings when the buffer satisfies pre-roll we can, given the current throughput and media rate, determine if the buffer would be growing towards target-time and if it does then avoid downshifts if Low water mark is greater than pre-roll.
This approach is a step towards the more elaborate buffer modelling that have been discussed in the recent meetings. This approach borrows from Aaron's suggestion of making target-time as the High water mark and Jason and Go's idea of using an estimated buffer growth to determine if we need to initiate a rate shift.
Files Affected
==============
common/include/hxstreamadapt.h
server_rn/qos/session/qos_sess_annexgbuf_verify.cpp
server_rn/qos/session/qos_sess_buffinfocollect.cpp
server_rn/qos/session/qos_sess_pktqueue.cpp
server_rn/qos/session/qos_sess_qosratemgr.cpp
server_rn/qos/session/pub/qos_sess_annexgbuf_verify.h
server_rn/qos/session/pub/qos_sess_buffinfocollect.h
server_rn/qos/session/pub/qos_sess_buffupdate.h
server_rn/qos/session/pub/qos_sess_pktqueue.h
server_rn/qos/session/pub/qos_sess_qosratemgr.h
server/engine/dataflow/static_pushpktflow.cpp
server/engine/dataflow/pub/static_pushpktflow.h
server/engine/inputsource/streamgroupmgr.cpp
server/engine/inputsource/uberstreammgr.cpp
server/engine/session/player.cpp
server/engine/session/pub/player.h
server/qos/session/pub/qos_sess_cbr_ratemgr.h
Reviewed by: Go Hori
Index: hxstreamadapt.h
===================================================================
RCS file: /cvsroot/common/include/hxstreamadapt.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hxstreamadapt.h 6 Dec 2004 01:38:10 -0000 1.6
+++ hxstreamadapt.h 17 Feb 2005 21:53:15 -0000 1.7
@@ -14,6 +14,36 @@
ADAPTATION_NONE
} StreamAdaptationSchemeEnum;
+
+#ifndef MDP_STREAM_ADAPT_HELPER_FUNC
+#define MDP_STREAM_ADAPT_HELPER_FUNC
+inline BOOL IsHelixStreamAdaptScheme(StreamAdaptationSchemeEnum enumStreamAdaptScheme)
+{
+ switch (enumStreamAdaptScheme)
+ {
+ case ADAPTATION_HLX_AGGR:
+ case ADAPTATION_HLX_PER_STREAM:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
+inline BOOL IsRel6StyleStreamAdaptScheme(StreamAdaptationSchemeEnum enumStreamAdaptScheme)
+{
+ switch (enumStreamAdaptScheme)
+ {
+ case ADAPTATION_HLX_AGGR:
+ case ADAPTATION_HLX_PER_STREAM:
+ case ADAPTATION_REL6_PER_STREAM:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+#endif
+
+
typedef struct _StreamAdaptationParams
{
_StreamAdaptationParams() : m_unStreamNum(0xFFFF)
@@ -23,6 +53,7 @@
, m_bStreamSwitch(FALSE)
, m_bBufferStateAvailable(FALSE)
, m_ulNumExcludedRules(0)
+ , m_ulMaxPreRoll(0)
{
}
@@ -36,6 +67,8 @@
BOOL m_bBufferStateAvailable; //true indicates client buffer feedback is available
UINT32 m_ulNumExcludedRules; // Number of excluded rules in m_pExcludeRules
UINT16 m_pExcludeRules [MAX_EXCLUDE_RULES]; //vector of rules to be excluded from adaptation
+
+ UINT32 m_ulMaxPreRoll; // Used for Aggregate Buffer Manangement (Helix-Adapt)
} StreamAdaptationParams;
typedef struct _LinkCharParams
From rishimathew at helixcommunity.org Thu Feb 17 14:03:08 2005
From: rishimathew at helixcommunity.org (rishimathew@helixcommunity.org)
Date: Thu Feb 17 14:03:01 2005
Subject: [Common-cvs] www/2004/devdocs quickstart.html,1.17,1.18
Message-ID:
Update of /cvsroot/common/www/2004/devdocs
In directory cvs-new:/tmp/cvs-serv17442
Modified Files:
quickstart.html
Log Message:
Modifying the ssh command in Quickstart guide to include "@"sign
Index: quickstart.html
===================================================================
RCS file: /cvsroot/common/www/2004/devdocs/quickstart.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- quickstart.html 14 Jul 2004 17:26:54 -0000 1.17
+++ quickstart.html 17 Feb 2005 22:03:06 -0000 1.18
@@ -491,7 +491,7 @@
- ssh -l myusername cvs.helixcommunity.org
+ ssh -l myusername@cvs.helixcommunity.org
|
From rishimathew at helixcommunity.org Thu Feb 17 14:53:52 2005
From: rishimathew at helixcommunity.org (rishimathew@helixcommunity.org)
Date: Thu Feb 17 14:53:45 2005
Subject: [Common-cvs] www/2004/devdocs quickstart.html,1.18,1.19
Message-ID:
Update of /cvsroot/common/www/2004/devdocs
In directory cvs-new:/tmp/cvs-serv27104
Modified Files:
quickstart.html
Log Message:
Reverting the usage of "@" before hostname
Index: quickstart.html
===================================================================
RCS file: /cvsroot/common/www/2004/devdocs/quickstart.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- quickstart.html 17 Feb 2005 22:03:06 -0000 1.18
+++ quickstart.html 17 Feb 2005 22:53:50 -0000 1.19
@@ -491,7 +491,7 @@
- ssh -l myusername@cvs.helixcommunity.org
+ ssh -l myusername cvs.helixcommunity.org
|
From liam_murray at helixcommunity.org Thu Feb 17 16:18:33 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:25 2005
Subject: [Common-cvs]
lang/xml hxxmlprs.cpp, 1.3.36.3, 1.3.36.4 looseprs.cpp,
1.6.28.3, 1.6.28.4 xmlencod.cpp, 1.5.32.3, 1.5.32.4 xmlesc.cpp,
1.8.2.1, 1.8.2.2
Message-ID:
Update of /cvsroot/common/lang/xml
In directory cvs-new:/tmp/cvs-serv27807/lang/xml
Modified Files:
Tag: hxclient_1_3_0_neptunex
hxxmlprs.cpp looseprs.cpp xmlencod.cpp xmlesc.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: xmlencod.cpp
===================================================================
RCS file: /cvsroot/common/lang/xml/xmlencod.cpp,v
retrieving revision 1.5.32.3
retrieving revision 1.5.32.4
diff -u -d -r1.5.32.3 -r1.5.32.4
--- xmlencod.cpp 9 Jul 2004 01:44:10 -0000 1.5.32.3
+++ xmlencod.cpp 18 Feb 2005 00:18:31 -0000 1.5.32.4
@@ -108,9 +108,9 @@
CHXXMLEncode::CHXXMLEncode(const char* pEncoding,
BYTE* pBuffer,
UINT32 ulLength):
- m_ulBufferLength(ulLength),
m_pBuffer(pBuffer),
- m_pCurrent(pBuffer)
+ m_pCurrent(pBuffer),
+ m_ulBufferLength(ulLength)
{
m_lEncodingIndex = GetEncodingIndex(pEncoding);
}
@@ -316,11 +316,12 @@
return ulLength;
}
+///@todo sizeof returns size_t which can be larger than INT32 (signed) and cause an infinite loop
INT32
CHXXMLEncode::GetEncodingIndex(const char* pEncoding)
{
INT32 lIndex = 0; // default
- for(INT32 lCount = 0;
+ for(UINT32 lCount = 0;
lCount < sizeof(XMLEncodingInfo) / sizeof(XMLEncodingInfo[0]);
++lCount)
{
Index: xmlesc.cpp
===================================================================
RCS file: /cvsroot/common/lang/xml/xmlesc.cpp,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- xmlesc.cpp 19 Jul 2004 21:04:07 -0000 1.8.2.1
+++ xmlesc.cpp 18 Feb 2005 00:18:31 -0000 1.8.2.2
@@ -162,15 +162,15 @@
*___________________________________________________________________________
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
CEscapeXMLtoHTML::CEscapeXMLtoHTML(IHXValues* pOptions, const char** pHotTags)
-: m_pEscapeStrings(NULL)
-, m_pServerUrl(NULL)
-, m_pOurPath(NULL)
-, m_pHotTags(NULL)
-, m_pDefaultView(NULL)
+: m_pOurPath(NULL)
, m_pFileName(NULL)
, m_pRamGen(NULL)
, m_ulModDate(0)
, m_ulFileSize(0)
+, m_pEscapeStrings(NULL)
+, m_pHotTags(NULL)
+, m_pDefaultView(NULL)
+, m_pServerUrl(NULL)
{
m_pHotTags = pHotTags;
@@ -1382,8 +1382,6 @@
}
else if ( !strncmp((const char*)pPositionPointer, "../", 3 ) )
{
- int count = 0;
-
// copy m_pOurPath into pLinkPath ourselves cause we need to be at
// the end anyway.
const char* pSrc = m_pOurPath;
Index: looseprs.cpp
===================================================================
RCS file: /cvsroot/common/lang/xml/looseprs.cpp,v
retrieving revision 1.6.28.3
retrieving revision 1.6.28.4
diff -u -d -r1.6.28.3 -r1.6.28.4
--- looseprs.cpp 9 Jul 2004 01:44:10 -0000 1.6.28.3
+++ looseprs.cpp 18 Feb 2005 00:18:31 -0000 1.6.28.4
@@ -66,15 +66,15 @@
XMLParser::XMLParser(BOOL bStrictCompliance, const char* pEncoding,
BOOL bAllowNonXMLComments):
m_bStrictCompliance(bStrictCompliance),
- m_bAllowNonXMLComments(bAllowNonXMLComments),
- m_bCommentWasFound(FALSE),
- m_bXMLandSMIL10FullCompliance(FALSE),
m_ulCurrentLine(1),
m_ulCurrentCol(1),
m_ulTagStartLine(1),
m_ulTagStartCol(1),
- m_pLastError(0)
- , m_bStoreErrors(FALSE)
+ m_pLastError(0),
+ m_bAllowNonXMLComments(bAllowNonXMLComments),
+ m_bCommentWasFound(FALSE),
+ m_bStoreErrors(FALSE),
+ m_bXMLandSMIL10FullCompliance(FALSE)
{
m_pCurrentFrame = new XMLFrame;
m_comment_state = 0;
@@ -541,7 +541,6 @@
XMLParser::FindCommentClose(const char*& buf, const char* start,
const char* end)
{
- BOOL bResult = FALSE;
UINT16 nCommentDepth = 1;
CHXXMLEncode xmlStr(m_pEncoding, (BYTE*)start, end - start);
@@ -1016,7 +1015,6 @@
XMLParser::ParseTag(const char* open, const char* close, XMLTagType tType, XMLTag*& tag)
{
const char* cur = open+1;
- const char* afterclose = close+1;
BOOL bHasAttributeNames = TRUE;
BOOL bUseNonQuotedValues = FALSE;
BOOL bHasDirectives = FALSE;
@@ -1234,12 +1232,10 @@
XMLParser::ScanTag(const char* open, const char* close, XMLTag* tag)
{
const char* cur = open+1;
- const char* afterclose = close+1;
char cQuote = '"';
CHXXMLEncode xmlStr(m_pEncoding, (BYTE*)cur, close - cur);
UINT16 uLen = 0;
- const char* ptr = (const char*)xmlStr.GetNextChar(uLen);
//tag->m_need_close
//tag->m_type;
@@ -1475,6 +1471,10 @@
}
}
break;
+ case Done:
+ break;
+ default:
+ HX_ASSERT(0);
}
}
@@ -1692,11 +1692,11 @@
INT32 lLinePosition,
const char* pErrorString,
const char* pFrameString):
- m_errorTag(errorTag),
+ m_pErrorString(0),
+ m_pFrameString(0),
m_lLineNumber(lLineNumber),
m_lLinePosition(lLinePosition),
- m_pErrorString(0),
- m_pFrameString(0)
+ m_errorTag(errorTag)
{
if(pErrorString)
{
Index: hxxmlprs.cpp
===================================================================
RCS file: /cvsroot/common/lang/xml/hxxmlprs.cpp,v
retrieving revision 1.3.36.3
retrieving revision 1.3.36.4
diff -u -d -r1.3.36.3 -r1.3.36.4
--- hxxmlprs.cpp 9 Jul 2004 01:44:10 -0000 1.3.36.3
+++ hxxmlprs.cpp 18 Feb 2005 00:18:31 -0000 1.3.36.4
@@ -77,9 +77,9 @@
HXXMLParser::HXXMLParser(BOOL bAllowNonXMLComments):
m_lRefCount(0),
- m_pParser(NULL),
m_pResponse(NULL),
- m_bAllowNonXMLComments(bAllowNonXMLComments)
+ m_bAllowNonXMLComments(bAllowNonXMLComments),
+ m_pParser(NULL)
{
}
From liam_murray at helixcommunity.org Thu Feb 17 16:18:33 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:26 2005
Subject: [Common-cvs] lang/xml/hxexpat expatprs.cpp,1.6.22.1,1.6.22.2
Message-ID:
Update of /cvsroot/common/lang/xml/hxexpat
In directory cvs-new:/tmp/cvs-serv27807/lang/xml/hxexpat
Modified Files:
Tag: hxclient_1_3_0_neptunex
expatprs.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: expatprs.cpp
===================================================================
RCS file: /cvsroot/common/lang/xml/hxexpat/expatprs.cpp,v
retrieving revision 1.6.22.1
retrieving revision 1.6.22.2
diff -u -d -r1.6.22.1 -r1.6.22.2
--- expatprs.cpp 19 Jul 2004 21:04:07 -0000 1.6.22.1
+++ expatprs.cpp 18 Feb 2005 00:18:31 -0000 1.6.22.2
@@ -83,10 +83,10 @@
HXExpatXMLParser::HXExpatXMLParser(IUnknown* pContext)
: m_lRefCount(0)
-, m_pParser(NULL)
, m_pResponse(NULL)
, m_pContext(pContext)
, m_pClassFactory(NULL)
+, m_pParser(NULL)
, m_pCurrentBuffer(NULL)
, m_ulCurrentOffset(0)
, m_pNSResp(NULL)
@@ -465,12 +465,9 @@
STDMETHODIMP
HXExpatXMLParser::GetCurrentErrorText(REF(IHXBuffer*) /*OUT*/ pBuffer)
{
- XML_Error code = XML_GetErrorCode(m_pParser);
/* Returns a string describing the error. */
UINT32 ulByteIndex = XML_GetCurrentByteIndex(m_pParser);
- UINT32 ulColumnNumber = XML_GetCurrentLineNumber(m_pParser);
-
-
+
const UCHAR* pPos = m_pCurrentBuffer->GetBuffer();
if ( SUCCEEDED(m_pClassFactory->CreateInstance(CLSID_IHXBuffer, (void**)&pBuffer)) )
{
From liam_murray at helixcommunity.org Thu Feb 17 16:18:34 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:26 2005
Subject: [Common-cvs] runtime hlxosstr.cpp, 1.13.2.5, 1.13.2.6 string.cpp,
1.5.2.3, 1.5.2.4
Message-ID:
Update of /cvsroot/common/runtime
In directory cvs-new:/tmp/cvs-serv27807/runtime
Modified Files:
Tag: hxclient_1_3_0_neptunex
hlxosstr.cpp string.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: hlxosstr.cpp
===================================================================
RCS file: /cvsroot/common/runtime/hlxosstr.cpp,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -u -d -r1.13.2.5 -r1.13.2.6
--- hlxosstr.cpp 9 Jul 2004 01:45:47 -0000 1.13.2.5
+++ hlxosstr.cpp 18 Feb 2005 00:18:31 -0000 1.13.2.6
@@ -365,9 +365,9 @@
m_isMutable(FALSE),
m_toAscii(TRUE),
m_size(0),
+ m_outsize(0),
m_uni(0),
- m_ascii(0),
- m_outsize(0)
+ m_ascii(0)
{
Init(ascii, length);
}
@@ -376,9 +376,9 @@
m_isMutable(TRUE),
m_toAscii(TRUE),
m_size(0),
+ m_outsize(0),
m_uni(0),
- m_ascii(ascii),
- m_outsize(0)
+ m_ascii(ascii)
{
Init(ascii, length);
}
@@ -387,9 +387,9 @@
m_isMutable(FALSE),
m_toAscii(TRUE),
m_size(0),
+ m_outsize(0),
m_uni(0),
- m_ascii(0),
- m_outsize(0)
+ m_ascii(0)
{
Init((const char*) ascii, length);
}
Index: string.cpp
===================================================================
RCS file: /cvsroot/common/runtime/string.cpp,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- string.cpp 9 Jul 2004 01:45:47 -0000 1.5.2.3
+++ string.cpp 18 Feb 2005 00:18:31 -0000 1.5.2.4
@@ -153,7 +153,7 @@
}
size_t len = strlen(str);
- for ( int i = 0; i < n && strlen(sc) > len; i++, sc++ )
+ for ( size_t i = 0; i < n && strlen(sc) > len; i++, sc++ )
{
if ( !strncmp(sc, str, len) )
{
@@ -182,7 +182,7 @@
const char*
__helix_strnchr(const char* sc, const char c, size_t n)
{
- for ( int i = 0; i < n && *sc; ++i, ++sc)
+ for ( size_t i = 0; i < n && *sc; ++i, ++sc)
{
if ( *sc == c )
{
From liam_murray at helixcommunity.org Thu Feb 17 16:18:34 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:26 2005
Subject: [Common-cvs] system recognizer.cpp,1.7.8.3,1.7.8.4
Message-ID:
Update of /cvsroot/common/system
In directory cvs-new:/tmp/cvs-serv27807/system
Modified Files:
Tag: hxclient_1_3_0_neptunex
recognizer.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: recognizer.cpp
===================================================================
RCS file: /cvsroot/common/system/recognizer.cpp,v
retrieving revision 1.7.8.3
retrieving revision 1.7.8.4
diff -u -d -r1.7.8.3 -r1.7.8.4
--- recognizer.cpp 13 Jul 2004 00:00:37 -0000 1.7.8.3
+++ recognizer.cpp 18 Feb 2005 00:18:32 -0000 1.7.8.4
@@ -329,8 +329,8 @@
CHXFileRecognizer::CHXFileRecognizer()
: m_lRefCount(0),
- m_pFile(NULL),
m_pResponse(NULL),
+ m_pFile(NULL),
m_pBuffer(NULL),
m_bGetMimeTypeDone(FALSE)
{
From liam_murray at helixcommunity.org Thu Feb 17 16:18:34 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:26 2005
Subject: [Common-cvs] system/pub pq.h,1.3.22.3,1.3.22.4
Message-ID:
Update of /cvsroot/common/system/pub
In directory cvs-new:/tmp/cvs-serv27807/system/pub
Modified Files:
Tag: hxclient_1_3_0_neptunex
pq.h
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: pq.h
===================================================================
RCS file: /cvsroot/common/system/pub/pq.h,v
retrieving revision 1.3.22.3
retrieving revision 1.3.22.4
diff -u -d -r1.3.22.3 -r1.3.22.4
--- pq.h 9 Jul 2004 01:43:51 -0000 1.3.22.3
+++ pq.h 18 Feb 2005 00:18:32 -0000 1.3.22.4
@@ -76,7 +76,7 @@
{
public:
FAST_CACHE_MEM
- PQElem() : m_pCallback(0), m_pNext(0), m_bDefunct(0), m_Id(0), m_bRemoved(0)
+ PQElem() : m_pCallback(0), m_pNext(0), m_bDefunct(0), m_bRemoved(0), m_Id(0)
{
m_Time.tv_sec = 0;
m_Time.tv_usec = 0;
From liam_murray at helixcommunity.org Thu Feb 17 16:18:35 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:29 2005
Subject: [Common-cvs] util activewrap.cpp, 1.4.20.3, 1.4.20.4 asmrulep.cpp,
1.14.2.3, 1.14.2.4 commreg.cpp, 1.10.32.3,
1.10.32.4 cookhlpr.cpp, 1.3.20.3, 1.3.20.4 cookies.cpp,
1.19.20.4, 1.19.20.5 cpacemkr.cpp, 1.6.20.5,
1.6.20.6 hxurl.cpp, 1.25.2.4, 1.25.2.5 key.cpp, 1.7.32.3,
1.7.32.4 localrep.c, 1.9.32.3, 1.9.32.4 pacutil.cpp, 1.2.38.3,
1.2.38.4 pckunpck.cpp, 1.11.28.4, 1.11.28.5 portaddr.cpp,
1.8.20.3, 1.8.20.4 pref.cpp, 1.9.32.3, 1.9.32.4 smpte.cpp,
1.4.32.3, 1.4.32.4
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv27807/util
Modified Files:
Tag: hxclient_1_3_0_neptunex
activewrap.cpp asmrulep.cpp commreg.cpp cookhlpr.cpp
cookies.cpp cpacemkr.cpp hxurl.cpp key.cpp localrep.c
pacutil.cpp pckunpck.cpp portaddr.cpp pref.cpp smpte.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: commreg.cpp
===================================================================
RCS file: /cvsroot/common/util/commreg.cpp,v
retrieving revision 1.10.32.3
retrieving revision 1.10.32.4
diff -u -d -r1.10.32.3 -r1.10.32.4
--- commreg.cpp 9 Jul 2004 01:48:15 -0000 1.10.32.3
+++ commreg.cpp 18 Feb 2005 00:18:32 -0000 1.10.32.4
@@ -75,10 +75,10 @@
#endif
CommonRegistry::CommonRegistry()
- : _count(0)
+ : m_LastError(HXR_OK)
+ , _count(0)
, m_pWatchList(NULL)
, m_lWatchCount(0)
- , m_LastError(HXR_OK)
{
_logdb_imp = new DB_dict;
if(!_logdb_imp)
@@ -766,8 +766,6 @@
{
DB_node* d = 0;
Property* p = 0;
- UINT32 h = hash_key;
-
d = (DB_node *)_ids->get(hash_key);
if (!d)
{
@@ -1000,7 +998,7 @@
{
DB_node* d = 0;
Property* p = 0;
- UINT32 h = hash_key;
+// UINT32 h = hash_key;
d = (DB_node *)_ids->get(hash_key);
if (!d)
@@ -1807,7 +1805,6 @@
{
DB_node* d = 0;
Property* p = 0;
- UINT32 h = hash_key;
d = (DB_node *)_ids->get(hash_key);
if (!d)
{
@@ -2183,8 +2180,6 @@
DB_node* d = 0;
Property* p = 0;
DB_implem* ldb = 0;
- UINT32 h = 0;
-
if (_find(&d, &p, prop_name) != HXR_OK)
return 0;
Index: asmrulep.cpp
===================================================================
RCS file: /cvsroot/common/util/asmrulep.cpp,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- asmrulep.cpp 9 Jul 2004 01:48:15 -0000 1.14.2.3
+++ asmrulep.cpp 18 Feb 2005 00:18:32 -0000 1.14.2.4
@@ -713,10 +713,10 @@
ASMRuleBook::ASMRuleBook(const char* pRuleBook)
-: m_pValidRulesArray(NULL)
+: m_LastError(HXR_OK)
+, m_pValidRulesArray(NULL)
, m_pDeletedRulesArray(NULL)
, m_pRuleBook(NULL)
-, m_LastError(HXR_OK)
{
m_ulNumThresholds = 1; // always have a default
int i;
Index: activewrap.cpp
===================================================================
RCS file: /cvsroot/common/util/activewrap.cpp,v
retrieving revision 1.4.20.3
retrieving revision 1.4.20.4
diff -u -d -r1.4.20.3 -r1.4.20.4
--- activewrap.cpp 9 Jul 2004 01:48:15 -0000 1.4.20.3
+++ activewrap.cpp 18 Feb 2005 00:18:32 -0000 1.4.20.4
@@ -90,9 +90,9 @@
CActivePropWrapper::CActivePropWrapper()
: m_lRefCount(0)
+ , m_pClassFactory(NULL)
, m_pContext(NULL)
, m_pUser(NULL)
- , m_pClassFactory(NULL)
{
};
Index: pacutil.cpp
===================================================================
RCS file: /cvsroot/common/util/pacutil.cpp,v
retrieving revision 1.2.38.3
retrieving revision 1.2.38.4
diff -u -d -r1.2.38.3 -r1.2.38.4
--- pacutil.cpp 9 Jul 2004 01:48:16 -0000 1.2.38.3
+++ pacutil.cpp 18 Feb 2005 00:18:32 -0000 1.2.38.4
@@ -223,7 +223,6 @@
HX_RESULT rc = HXR_FAILED;
int nFields = 0;
int i = 0;
- char* pszFile = NULL;
CHXString filesIn;
CHXString fileInfo;
CHXString fileName;
Index: localrep.c
===================================================================
RCS file: /cvsroot/common/util/localrep.c,v
retrieving revision 1.9.32.3
retrieving revision 1.9.32.4
diff -u -d -r1.9.32.3 -r1.9.32.4
--- localrep.c 9 Jul 2004 01:48:16 -0000 1.9.32.3
+++ localrep.c 18 Feb 2005 00:18:32 -0000 1.9.32.4
@@ -89,12 +89,12 @@
*/
INT32 HXGetLocalTimeString(char *buffer, INT32 sizeOfBuffer, const char *formatString, ULONG32 flags, time_t time, ULONG32 locale)
{
- // Translate the flags for this system...
- ULONG32 sysflags = TranslateLocalTimeStringFlags(flags);
INT32 result = 0;
-
#ifdef WIN32
- // Copy the time into the appropriate format for the routine to use...
+ // Translate the flags for this system...
+ ULONG32 sysflags = TranslateLocalTimeStringFlags(flags);
+
+ // Copy the time into the appropriate format for the routine to use...
SYSTEMTIME sysTime;
if (time > 0)
{
@@ -247,13 +247,14 @@
*/
INT32 HXGetLocalDateString(char *buffer, INT32 sizeOfBuffer, const char *formatString, ULONG32 flags, time_t time, ULONG32 locale)
{
- // Translate the flags for this system...
- ULONG32 sysflags = TranslateLocalDateStringFlags(flags);
INT32 result = 0;
#ifdef WIN32
- char tempFormatString[256]; /* Flawfinder: ignore */
+ // Translate the flags for this system...
+ ULONG32 sysflags = TranslateLocalDateStringFlags(flags);
+
+ char tempFormatString[256]; /* Flawfinder: ignore */
// Copy the time into the appropriate format for the routine to use...
SYSTEMTIME sysTime;
Index: cookies.cpp
===================================================================
RCS file: /cvsroot/common/util/cookies.cpp,v
retrieving revision 1.19.20.4
retrieving revision 1.19.20.5
diff -u -d -r1.19.20.4 -r1.19.20.5
--- cookies.cpp 9 Jul 2004 01:48:15 -0000 1.19.20.4
+++ cookies.cpp 18 Feb 2005 00:18:32 -0000 1.19.20.5
@@ -136,17 +136,17 @@
HXCookies::HXCookies(IUnknown* pContext, BOOL bMemoryOnly)
: m_lRefCount(0)
+ , m_pContext(NULL)
+ , m_bInitialized(FALSE)
, m_bSaveCookies(FALSE)
, m_bMemoryOnly(bMemoryOnly)
, m_pNSCookiesPath(NULL)
- , m_pNSCookies(NULL)
, m_pRMCookiesPath(NULL)
+ , m_lastModification(0)
+ , m_pNSCookies(NULL)
, m_pRMCookies(NULL)
- , m_pCookiesHelper(NULL)
, m_pPreferences(NULL)
- , m_bInitialized(FALSE)
- , m_lastModification(0)
- , m_pContext(NULL)
+ , m_pCookiesHelper(NULL)
#ifdef _WINDOWS
, m_hLib(NULL)
, m_pLock(NULL)
@@ -313,7 +313,6 @@
{
HX_RESULT hr = HXR_OK;
int host_length = 0;
- int path_length = 0;
int domain_length = 0;
char* pURL = NULL;
char* path_from_header = NULL;
@@ -321,12 +320,14 @@
char* name_from_header = NULL;
char* cookie_from_header = NULL;
char* dot = NULL;
- char* slash = NULL;
BOOL bIsDomain = FALSE;
time_t expires=0;
IHXBuffer* pBuffer = NULL;
IHXValues* pValues = NULL;
CookieStruct* pNewCookie = NULL;
+#if defined (_WINDOWS)
+ int path_length = 0;
+#endif
if (!IsCookieEnabled())
{
@@ -550,24 +551,27 @@
REF(IHXBuffer*) pPlayerCookies)
{
HX_RESULT hr = HXR_OK;
+#ifdef _WINDOWS
char* cp = NULL;
- char* pComma = NULL;
+ char* pComma = NULL;
char* pEqualSign = NULL;
- char* pData = NULL;
- char* pURL = NULL;
- int l = 0;
int host_length = 0;
int path_length = 0;
- BOOL bAdded = FALSE;
-UINT32 dwSize = 0;
+ UINT32 dwSize = 0;
+ BOOL bAdded = FALSE;
+ CookieStruct* pNewCookie = NULL;
+#endif /* _WINDOWS */
+
+ char* pData = NULL;
+ char* pURL = NULL;
time_t cur_time = time(NULL);
+ int l = 0;
CookieStruct* pTempCookie = NULL;
- CookieStruct* pNewCookie = NULL;
CHXSimpleList* pCookiesFound1 = NULL;
CHXSimpleList* pCookiesFound2 = NULL;
CHXSimpleList* pCookiesList = NULL;
IHXValues* pValues = NULL;
- CHXSimpleList::Iterator i;
+ CHXSimpleList::Iterator iterator;
CHXString cHostCopy;
INT32 lColon;
BOOL bIsPlayerCookieList = FALSE;
@@ -643,9 +647,9 @@
continue;
}
- for (i = pCookiesList->Begin(); i != pCookiesList->End(); ++i)
+ for (iterator = pCookiesList->Begin(); iterator != pCookiesList->End(); ++iterator)
{
- pTempCookie = (CookieStruct*) (*i);
+ pTempCookie = (CookieStruct*) (*iterator);
if (!pTempCookie->pHost)
{
@@ -834,9 +838,9 @@
if (pCookiesFound1)
{
- for (i = pCookiesFound1->Begin(); i != pCookiesFound1->End(); ++i)
+ for (iterator = pCookiesFound1->Begin(); iterator != pCookiesFound1->End(); ++iterator)
{
- pTempCookie = (CookieStruct*) (*i);
+ pTempCookie = (CookieStruct*) (*iterator);
if(pTempCookie->pCookieName && pTempCookie->pCookieValue)
{
@@ -849,9 +853,9 @@
if (pCookiesFound2)
{
- for (i = pCookiesFound2->Begin(); i != pCookiesFound2->End(); ++i)
+ for (iterator = pCookiesFound2->Begin(); iterator != pCookiesFound2->End(); ++iterator)
{
- pTempCookie = (CookieStruct*) (*i);
+ pTempCookie = (CookieStruct*) (*iterator);
if(pTempCookie->pCookieName && pTempCookie->pCookieValue)
{
@@ -1168,8 +1172,6 @@
char * hostname,
char * name)
{
- int nResult = 0;
- const char* pValue = NULL;
BOOL bFound = FALSE;
CookieStruct* pCookie = NULL;
CHXSimpleList::Iterator i;
@@ -1948,21 +1950,23 @@
REF(IHXBuffer*) pCookies)
{
HX_RESULT hr = HXR_OK;
- char* cp = NULL;
+#ifdef _WINDOWS
+ char* cp = NULL;
char* pComma = NULL;
char* pEqualSign = NULL;
- char* pData = NULL;
- char* pURL = NULL;
- int l = 0;
- int host_length = 0;
+ int host_length = 0;
int path_length = 0;
- int domain_length = 0;
- BOOL bAdded = FALSE;
+ BOOL bAdded = FALSE;
UINT32 dwSize = 0;
+ CookieStruct* pNewCookie = NULL;
+ char* pURL = NULL;
+#endif
+ char* pData = NULL;
+ int domain_length = 0;
time_t cur_time = time(NULL);
CookieStruct* pTempCookie = NULL;
- CookieStruct* pNewCookie = NULL;
CHXSimpleList* pCookiesFound1 = NULL;
+ int l = 0;
//CHXSimpleList* pCookiesFound2 = NULL;
CHXSimpleList* pCookiesList = NULL;
IHXValues* pValues = NULL;
@@ -2242,7 +2246,10 @@
HX_DELETE(pCookiesFound1);
//HX_DELETE(pCookiesFound2);
HX_VECTOR_DELETE(pData);
- HX_VECTOR_DELETE(pURL);
+
+#ifdef _WINDOWS
+ HX_VECTOR_DELETE(pURL);
+#endif
HX_RELEASE(pValues);
Index: smpte.cpp
===================================================================
RCS file: /cvsroot/common/util/smpte.cpp,v
retrieving revision 1.4.32.3
retrieving revision 1.4.32.4
diff -u -d -r1.4.32.3 -r1.4.32.4
--- smpte.cpp 9 Jul 2004 01:48:16 -0000 1.4.32.3
+++ smpte.cpp 18 Feb 2005 00:18:32 -0000 1.4.32.4
@@ -69,16 +69,16 @@
m_minute(0),
m_second(0),
m_frame(0),
- m_mSecs(0),
m_dropFrame(DROP_FRAME),
- m_framesPerSec(FPS_30)
+ m_framesPerSec(FPS_30),
+ m_mSecs(0)
{
}
SMPTETimeCode::SMPTETimeCode(UINT32 mSec):
- m_mSecs(mSec),
m_dropFrame(DROP_FRAME),
- m_framesPerSec(FPS_30)
+ m_framesPerSec(FPS_30),
+ m_mSecs(mSec)
{
fromMSec();
}
@@ -182,7 +182,6 @@
m_minute = HX_SAFEINT(hourRem / (fps * 60));
UINT32 minRem = hourRem - (m_minute * fps * 60);
m_second = HX_SAFEINT(minRem / fps);
- UINT32 secRem = minRem - (m_second * fps);
m_frame = HX_SAFEINT(ttlFrames % fps);
}
Index: key.cpp
===================================================================
RCS file: /cvsroot/common/util/key.cpp,v
retrieving revision 1.7.32.3
retrieving revision 1.7.32.4
diff -u -d -r1.7.32.3 -r1.7.32.4
--- key.cpp 9 Jul 2004 01:48:16 -0000 1.7.32.3
+++ key.cpp 18 Feb 2005 00:18:32 -0000 1.7.32.4
@@ -140,8 +140,6 @@
Key::get_sub_str(char* buf, int buf_len, char delim)
{
int c_len = 0;
- char d = (delim) ? delim : _delim;
-
if (_curr_ptr && _curr_level >= _num_levels)
return 0;
@@ -173,7 +171,6 @@
Key::append_sub_str(char* buf, int buf_len, char delim)
{
int c_len = 0;
- char d = (delim) ? delim : _delim;
// if we have reached the end of the key string
if (_curr_level >= _num_levels)
Index: pref.cpp
===================================================================
RCS file: /cvsroot/common/util/pref.cpp,v
retrieving revision 1.9.32.3
retrieving revision 1.9.32.4
diff -u -d -r1.9.32.3 -r1.9.32.4
--- pref.cpp 9 Jul 2004 01:48:16 -0000 1.9.32.3
+++ pref.cpp 18 Feb 2005 00:18:32 -0000 1.9.32.4
@@ -164,16 +164,16 @@
}
CPrefTable::CPrefTable(PrefTableEntry* pPrefTable,INT32 nTableEntries,CPref* pPrefs) :
- m_pPrefTable(pPrefTable),
m_nTableEntries(nTableEntries),
+ m_pPrefTable(pPrefTable),
m_pCPref(pPrefs),
m_pIHXPrefs(NULL)
{
}
CPrefTable::CPrefTable(PrefTableEntry* pPrefTable,INT32 nTableEntries,IHXPreferences* pPrefs) :
- m_pPrefTable(pPrefTable),
m_nTableEntries(nTableEntries),
+ m_pPrefTable(pPrefTable),
m_pCPref(NULL),
m_pIHXPrefs(pPrefs)
{
Index: pckunpck.cpp
===================================================================
RCS file: /cvsroot/common/util/pckunpck.cpp,v
retrieving revision 1.11.28.4
retrieving revision 1.11.28.5
diff -u -d -r1.11.28.4 -r1.11.28.5
--- pckunpck.cpp 9 Jul 2004 01:48:16 -0000 1.11.28.4
+++ pckunpck.cpp 18 Feb 2005 00:18:32 -0000 1.11.28.5
@@ -141,7 +141,7 @@
{
case 'f':
{
- BOOL bFlag = va_arg(vargs, BOOL);
+ va_arg(vargs, BOOL);
// XXXNH: optimization... we only put one char for a flag/bool
uBufSize += 1;
}
@@ -149,7 +149,7 @@
case 'd':
{
- double dVal = va_arg(vargs, double);
+ va_arg(vargs, double);
// to preserve precision we base64-ize the double
uBufSize += (sizeof(double) * 4) / 3 + 10;
@@ -204,7 +204,7 @@
case 'p':
{
- IUnknown* pPointer = va_arg(vargs, IUnknown*);
+ va_arg(vargs, IUnknown*);
uBufSize += 8; // 8 digits for a hex number
}
break;
@@ -287,7 +287,8 @@
{
double dVal = va_arg(vargs, double);
- UINT32 uSize = (sizeof(double) * 4) / 3 + 10;
+ //UINT32 uSize =(sizeof(double) * 4) / 3 + 10;
+
int nLen = BinTo64((UCHAR*)&dVal, sizeof(double), pBufStr);
HX_ASSERT(nLen >= 0);
pBufStr += nLen-1; // -1 because of null terminator
@@ -366,7 +367,7 @@
case 'v':
{
- IHXValues* pIgnoreMe = va_arg(vargs, IHXValues*);
+ va_arg(vargs, IHXValues*);
LISTPOSITION p = packedValuesList.GetHeadPosition();
CHXString* psPacked = packedValuesList.GetNext(p);
@@ -474,7 +475,8 @@
if (pEnd)
{
int nSize = pEnd - pBufStr;
- int nLen = BinFrom64(pBufStr, nSize, (UCHAR*)pdVal);
+ int nLen = 0;
+ nLen = BinFrom64(pBufStr, nSize, (UCHAR*)pdVal);
HX_ASSERT(nLen == sizeof(double));
pBufStr = pEnd;
}
@@ -484,14 +486,13 @@
break;
case 'u':
- {
- UINT32* puInt = va_arg(vargs, UINT32*);
+ { va_arg(vargs, UINT32*);
// XXXSAB Untested...
char* pEnd = NULL;
- unsigned long val = strtoul(pBufStr, &pEnd, 16);
+ strtoul(pBufStr, &pEnd, 16);
- // if (sscanf(pBufStr, "%x", puInt) == 1)
+ // if (sscanf(pBufStr, "%x", puInt) == 1)
if (pEnd && pEnd > pBufStr)
{
// advance to the next delimiter
@@ -508,7 +509,7 @@
HX_ASSERT(pTemp);
if (!pTemp)
return nRead; // invalid CHXString*?
- pTemp->Empty();
+ pTemp->Empty();
// read the begin quote
if (*pBufStr != '"')
@@ -609,7 +610,7 @@
char tmpBuf[9];
SafeStrCpy(tmpBuf, pBufStr, 8);
tmpBuf[9] = 0;
- unsigned long val = strtoul(tmpBuf, &pEnd, 16);
+ strtoul(tmpBuf, &pEnd, 16);
// if (sscanf(pBufStr, "%08x", ppUnk) != 1)
if (pEnd && pEnd > tmpBuf)
@@ -715,11 +716,10 @@
char* pTemp = (char*)sTemp.GetBuffer(uSize);
if (pTemp)
{
-// int nLen = BinTo64(pValBuf->GetBuffer(), uSize, pTemp);
- int nLen = BinTo64(pValBuf->GetBuffer(), pValBuf->GetSize(), pTemp);
+ int nLen = 0;
+ nLen = BinTo64(pValBuf->GetBuffer(), pValBuf->GetSize(), pTemp);
sTemp.ReleaseBuffer();
-
- HX_ASSERT(nLen >= 0);
+ HX_ASSERT(nLen >= 0); // It's used
}
HX_RELEASE(pValBuf);
Index: cookhlpr.cpp
===================================================================
RCS file: /cvsroot/common/util/cookhlpr.cpp,v
retrieving revision 1.3.20.3
retrieving revision 1.3.20.4
diff -u -d -r1.3.20.3 -r1.3.20.4
--- cookhlpr.cpp 9 Jul 2004 01:48:15 -0000 1.3.20.3
+++ cookhlpr.cpp 18 Feb 2005 00:18:32 -0000 1.3.20.4
@@ -122,14 +122,12 @@
char* ptr = NULL;
char* semi_colon = NULL;
char* set_cookie_header = NULL;
- char* slash = NULL;
char* equal = NULL;
char* date = NULL;
char* path_from_header = NULL;
char* domain_from_header = NULL;
char* name_from_header = NULL;
char* cookie_from_header = NULL;
- IHXBuffer* pBuffer = NULL;
if (!pCookies)
{
Index: cpacemkr.cpp
===================================================================
RCS file: /cvsroot/common/util/cpacemkr.cpp,v
retrieving revision 1.6.20.5
retrieving revision 1.6.20.6
diff -u -d -r1.6.20.5 -r1.6.20.6
--- cpacemkr.cpp 28 Oct 2004 22:57:43 -0000 1.6.20.5
+++ cpacemkr.cpp 18 Feb 2005 00:18:32 -0000 1.6.20.6
@@ -81,17 +81,17 @@
* Constructor/Destructor
*/
CVideoPaceMaker::CVideoPaceMaker(void)
- : m_pThread(NULL)
- , m_pResponse(NULL)
+ : m_pResponse(NULL)
+ , m_pThread(NULL)
, m_bActive(FALSE)
- , m_bThreadIdle(FALSE)
, m_bThreadActive(FALSE)
+ , m_bThreadIdle(FALSE)
, m_bSuspend(FALSE)
, m_bSuspended(FALSE)
, m_ulBaseTime(0)
- , m_pEvent(NULL)
, m_ulInterval(0)
, m_ulId(0)
+ , m_pEvent(NULL)
, m_lRefCount(0)
{
;
Index: hxurl.cpp
===================================================================
RCS file: /cvsroot/common/util/hxurl.cpp,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -d -r1.25.2.4 -r1.25.2.5
--- hxurl.cpp 9 Jul 2004 01:48:15 -0000 1.25.2.4
+++ hxurl.cpp 18 Feb 2005 00:18:32 -0000 1.25.2.5
@@ -143,7 +143,6 @@
char* pszTemp = NULL;
char* pFragment = NULL;
char* pNewURL = NULL;
- char* pResource = NULL;
char* pszDollarSign = NULL;
HX_ASSERT(pszURL != NULL);
@@ -1099,7 +1098,7 @@
urlPrefix += "/";
}
- if(HXR_OK == pHeader->GetPropertyBuffer(PROPERTY_RESOURCE, pBuffer))
+ if(HXR_OK == pHeader->GetPropertyBuffer(PROPERTY_RESOURCE, pBuffer))
{
const char* pResource = (const char*)pBuffer->GetBuffer();
const char cDelimiter1 = '/';
@@ -1111,7 +1110,6 @@
char* pFirstChar = strURLWork.GetBuffer(strURLWork.GetLength());
char* pLastChar = NULL;
char* pOptions = NULL;
- char* pFragment = NULL;
pOptions = strchr(pFirstChar, '?');
Index: portaddr.cpp
===================================================================
RCS file: /cvsroot/common/util/portaddr.cpp,v
retrieving revision 1.8.20.3
retrieving revision 1.8.20.4
diff -u -d -r1.8.20.3 -r1.8.20.4
--- portaddr.cpp 9 Jul 2004 01:48:16 -0000 1.8.20.3
+++ portaddr.cpp 18 Feb 2005 00:18:32 -0000 1.8.20.4
@@ -424,7 +424,6 @@
SubnetEntry::SubnetEntry(const char* pszValue)
: CommonEntry(pszValue)
{
- UINT8 size = 0;
UINT32 ulIAddress = 0;
char* pColumn = NULL;
From liam_murray at helixcommunity.org Thu Feb 17 16:18:31 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:54 2005
Subject: [Common-cvs]
container cbbqueue.cpp, 1.5.32.3, 1.5.32.4 cbqueue.cpp,
1.6.32.3, 1.6.32.4 dict.cpp, 1.4.32.3, 1.4.32.4 hxbuffer.cpp,
1.9.32.3, 1.9.32.4 hxstradv.cpp, 1.10.32.3,
1.10.32.4 hxvalues.cpp, 1.4.20.3, 1.4.20.4 statinfo.cpp,
1.8.32.3, 1.8.32.4
Message-ID:
Update of /cvsroot/common/container
In directory cvs-new:/tmp/cvs-serv27807/container
Modified Files:
Tag: hxclient_1_3_0_neptunex
cbbqueue.cpp cbqueue.cpp dict.cpp hxbuffer.cpp hxstradv.cpp
hxvalues.cpp statinfo.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: statinfo.cpp
===================================================================
RCS file: /cvsroot/common/container/statinfo.cpp,v
retrieving revision 1.8.32.3
retrieving revision 1.8.32.4
diff -u -d -r1.8.32.3 -r1.8.32.4
--- statinfo.cpp 9 Jul 2004 01:45:59 -0000 1.8.32.3
+++ statinfo.cpp 18 Feb 2005 00:18:29 -0000 1.8.32.4
@@ -67,10 +67,10 @@
CStatisticEntry::CStatisticEntry(IHXRegistry* pRegistry,
char* pszRegKey,
UINT32 ulType)
- : m_bAddKey(FALSE)
+ : m_pRegistry(NULL)
, m_ulRegistryID(0)
- , m_pRegistry(NULL)
, m_ulType(REG_TYPE_UNKNOWN)
+ , m_bAddKey(FALSE)
{
if (pRegistry)
{
@@ -241,10 +241,10 @@
STATS::STATS(IHXRegistry* /*IN*/ pRegistry,
UINT32 /*IN*/ ulRegistryID)
- : m_pRegistry(NULL)
+ : m_lastError(HXR_OK)
+ , m_pRegistry(NULL)
, m_ulRegistryID(0)
, m_bInitialized(FALSE)
- , m_lastError(HXR_OK)
, m_pNormal(0)
, m_pRecovered(0)
, m_pReceived(0)
Index: cbqueue.cpp
===================================================================
RCS file: /cvsroot/common/container/cbqueue.cpp,v
retrieving revision 1.6.32.3
retrieving revision 1.6.32.4
diff -u -d -r1.6.32.3 -r1.6.32.4
--- cbqueue.cpp 9 Jul 2004 01:45:59 -0000 1.6.32.3
+++ cbqueue.cpp 18 Feb 2005 00:18:27 -0000 1.6.32.4
@@ -113,11 +113,11 @@
*/
CByteQueue::CByteQueue( UINT16 nSize, UINT16 nGranularity ) :
m_pData( 0 ),
- m_pTail( 0 ),
m_pHead( 0 ),
+ m_pTail( 0 ),
m_pMax( 0 ),
- m_nMaxSize(0),
- m_nGranularity( nGranularity )
+ m_nGranularity( nGranularity ),
+ m_nMaxSize(0)
{
HX_ASSERT( this );
@@ -161,8 +161,8 @@
*/
CByteQueue::CByteQueue( const CByteQueue &rReferent ) :
m_pData( 0 ),
- m_pTail( 0 ),
m_pHead( 0 ),
+ m_pTail( 0 ),
m_pMax( 0 ),
m_nSize( 0 ),
m_nGranularity( 0 ),
Index: hxstradv.cpp
===================================================================
RCS file: /cvsroot/common/container/hxstradv.cpp,v
retrieving revision 1.10.32.3
retrieving revision 1.10.32.4
diff -u -d -r1.10.32.3 -r1.10.32.4
--- hxstradv.cpp 9 Jul 2004 01:45:59 -0000 1.10.32.3
+++ hxstradv.cpp 18 Feb 2005 00:18:29 -0000 1.10.32.4
@@ -146,10 +146,9 @@
static const int MaxULongString = 12;
char buf[MaxULongString]; /* Flawfinder: ignore */
- int tmp = SafeSprintf(buf, MaxULongString, "%lu", value);
-
+ int tmp=0; // TO FIX UNUSED VARIABLE WARNING
+ tmp = SafeSprintf(buf, MaxULongString, "%lu", value);
HX_ASSERT(tmp < MaxULongString);
-
*this += buf;
}
Index: dict.cpp
===================================================================
RCS file: /cvsroot/common/container/dict.cpp,v
retrieving revision 1.4.32.3
retrieving revision 1.4.32.4
diff -u -d -r1.4.32.3 -r1.4.32.4
--- dict.cpp 9 Jul 2004 01:45:59 -0000 1.4.32.3
+++ dict.cpp 18 Feb 2005 00:18:27 -0000 1.4.32.4
@@ -164,7 +164,6 @@
{
Dict_entry* e, **ep;
unsigned int h = _hash(key);
- int h_index = h%_nbuckets;
for (ep = &_table[h%_nbuckets]; (e = *ep) != 0; ep = &e->next)
{
if (_compare(key, e->key) != 0)
Index: hxbuffer.cpp
===================================================================
RCS file: /cvsroot/common/container/hxbuffer.cpp,v
retrieving revision 1.9.32.3
retrieving revision 1.9.32.4
diff -u -d -r1.9.32.3 -r1.9.32.4
--- hxbuffer.cpp 9 Jul 2004 01:45:59 -0000 1.9.32.3
+++ hxbuffer.cpp 18 Feb 2005 00:18:27 -0000 1.9.32.4
@@ -114,8 +114,8 @@
CHXBuffer::CHXBuffer()
: m_lRefCount(0)
- , m_bJustPointToExistingData(FALSE)
, m_ulAllocLength(0)
+ , m_bJustPointToExistingData(FALSE)
{
m_BigData.m_pData = NULL;
m_BigData.m_ulLength = 0;
Index: cbbqueue.cpp
===================================================================
RCS file: /cvsroot/common/container/cbbqueue.cpp,v
retrieving revision 1.5.32.3
retrieving revision 1.5.32.4
diff -u -d -r1.5.32.3 -r1.5.32.4
--- cbbqueue.cpp 9 Jul 2004 01:45:59 -0000 1.5.32.3
+++ cbbqueue.cpp 18 Feb 2005 00:18:27 -0000 1.5.32.4
@@ -102,11 +102,11 @@
*/
CBigByteQueue::CBigByteQueue( UINT32 ulSize, UINT32 ulElementSize ) :
m_pData( 0 ),
- m_pTail( 0 ),
m_pHead( 0 ),
+ m_pTail( 0 ),
m_pMax( 0 ),
- m_ulMaxSize(0),
- m_ulElementSize( ulElementSize )
+ m_ulElementSize( ulElementSize ),
+ m_ulMaxSize(0)
{
HX_ASSERT( this );
@@ -150,8 +150,8 @@
*/
CBigByteQueue::CBigByteQueue( const CBigByteQueue &rReferent ) :
m_pData( 0 ),
- m_pTail( 0 ),
m_pHead( 0 ),
+ m_pTail( 0 ),
m_pMax( 0 ),
m_ulSize( 0 ),
m_ulElementSize( 0 ),
Index: hxvalues.cpp
===================================================================
RCS file: /cvsroot/common/container/hxvalues.cpp,v
retrieving revision 1.4.20.3
retrieving revision 1.4.20.4
diff -u -d -r1.4.20.3 -r1.4.20.4
--- hxvalues.cpp 9 Jul 2004 01:45:59 -0000 1.4.20.3
+++ hxvalues.cpp 18 Feb 2005 00:18:29 -0000 1.4.20.4
@@ -498,7 +498,7 @@
return 0;
}
-CKeyValueList::CKeyValueList() : m_pTail(NULL), m_lRefCount(0)
+CKeyValueList::CKeyValueList() : m_lRefCount(0), m_pTail(NULL)
{
m_pList = new list;
m_pList->AddRef();
From liam_murray at helixcommunity.org Thu Feb 17 16:18:32 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:54 2005
Subject: [Common-cvs] fileio cchx2ihxdataf.cpp, 1.4.42.3,
1.4.42.4 chunkres.cpp, 1.14.32.4, 1.14.32.5
Message-ID:
Update of /cvsroot/common/fileio
In directory cvs-new:/tmp/cvs-serv27807/fileio
Modified Files:
Tag: hxclient_1_3_0_neptunex
cchx2ihxdataf.cpp chunkres.cpp
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: chunkres.cpp
===================================================================
RCS file: /cvsroot/common/fileio/chunkres.cpp,v
retrieving revision 1.14.32.4
retrieving revision 1.14.32.5
diff -u -d -r1.14.32.4 -r1.14.32.5
--- chunkres.cpp 9 Jul 2004 01:44:51 -0000 1.14.32.4
+++ chunkres.cpp 18 Feb 2005 00:18:29 -0000 1.14.32.5
@@ -1034,7 +1034,8 @@
delete pChunk;
}
}
- HX_RESULT theErr = DiscardDiskData();
+ HX_RESULT theErr = HXR_OK;
+ theErr = DiscardDiskData();
HX_ASSERT(theErr == HXR_OK);
if(m_ChunksMemoryMRU)
@@ -1803,7 +1804,9 @@
//
CChunkyResChunk::~CChunkyResChunk()
{
- HX_RESULT theErr = DiscardDiskData();
+
+ HX_RESULT theErr = HXR_OK;
+ theErr = DiscardDiskData();
HX_ASSERT(theErr == HXR_OK);
if (m_pChunkData)
@@ -1936,11 +1939,11 @@
if (pFileName && *pFileName)
{
+ int nRet = 0;
#if defined (_MACINTOSH) || defined (_UNIX) || defined(_SYMBIAN) || defined(_OPENWAVE)
- int nRet = unlink(pFileName);
+ nRet = unlink(pFileName);
#else
- int nRet = -1;
-
+ nRet =-1;
if (DeleteFile(OS_STRING(pFileName)))
nRet = 0;
#endif
Index: cchx2ihxdataf.cpp
===================================================================
RCS file: /cvsroot/common/fileio/cchx2ihxdataf.cpp,v
retrieving revision 1.4.42.3
retrieving revision 1.4.42.4
diff -u -d -r1.4.42.3 -r1.4.42.4
--- cchx2ihxdataf.cpp 9 Jul 2004 01:44:51 -0000 1.4.42.3
+++ cchx2ihxdataf.cpp 18 Feb 2005 00:18:29 -0000 1.4.42.4
@@ -74,11 +74,11 @@
FastReadFnPtr fpFastWrite,
FileDeleteFnPtr fpFileDelete)
: m_pIHXFile(pIHXFile)
- , m_pUserData(pUserData)
, m_fpFileDelete(fpFileDelete)
, m_fpTempFileName(fpTempFileName)
, m_fpFastRead(fpFastRead)
, m_fpFastWrite(fpFastWrite)
+ , m_pUserData(pUserData)
{
if (m_pIHXFile)
{
From liam_murray at helixcommunity.org Thu Feb 17 16:18:31 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:55 2005
Subject: [Common-cvs] container/pub hxbuffer.h,1.6.32.3,1.6.32.4
Message-ID:
Update of /cvsroot/common/container/pub
In directory cvs-new:/tmp/cvs-serv27807/container/pub
Modified Files:
Tag: hxclient_1_3_0_neptunex
hxbuffer.h
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: hxbuffer.h
===================================================================
RCS file: /cvsroot/common/container/pub/hxbuffer.h,v
retrieving revision 1.6.32.3
retrieving revision 1.6.32.4
diff -u -d -r1.6.32.3 -r1.6.32.4
--- hxbuffer.h 9 Jul 2004 01:45:51 -0000 1.6.32.3
+++ hxbuffer.h 18 Feb 2005 00:18:29 -0000 1.6.32.4
@@ -60,7 +60,7 @@
// pieces of data.
#define PnBufferShort
#ifdef PnBufferShort
-const int MaxPnbufShortDataLen = 15;
+const UINT32 MaxPnbufShortDataLen = 15;
#endif
#define NUM_ALLOCATION_EACH_TIME 25
From liam_murray at helixcommunity.org Thu Feb 17 16:18:32 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:55 2005
Subject: [Common-cvs] import/expat/xmlparse xmlparse.c,1.4.20.1,1.4.20.2
Message-ID:
Update of /cvsroot/common/import/expat/xmlparse
In directory cvs-new:/tmp/cvs-serv27807/import/expat/xmlparse
Modified Files:
Tag: hxclient_1_3_0_neptunex
xmlparse.c
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: xmlparse.c
===================================================================
RCS file: /cvsroot/common/import/expat/xmlparse/xmlparse.c,v
retrieving revision 1.4.20.1
retrieving revision 1.4.20.2
diff -u -d -r1.4.20.1 -r1.4.20.2
--- xmlparse.c 21 Apr 2004 23:56:18 -0000 1.4.20.1
+++ xmlparse.c 18 Feb 2005 00:18:30 -0000 1.4.20.2
@@ -1116,7 +1116,8 @@
XML_T("error in processing external entity reference"),
XML_T("document is not standalone")
};
- if (code > 0 && code < sizeof(message)/sizeof(message[0]))
+ int codeIndex = sizeof(message)/sizeof(message[0]);
+ if (code > 0 && code < codeIndex)
return message[code];
return 0;
}
From liam_murray at helixcommunity.org Thu Feb 17 16:18:32 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:56 2005
Subject: [Common-cvs] include platform.h, 1.18.2.3, 1.18.2.4 rmfftype.h,
1.5.8.4, 1.5.8.5
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv27807/include
Modified Files:
Tag: hxclient_1_3_0_neptunex
platform.h rmfftype.h
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: platform.h
===================================================================
RCS file: /cvsroot/common/include/platform.h,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- platform.h 9 Jul 2004 01:45:13 -0000 1.18.2.3
+++ platform.h 18 Feb 2005 00:18:30 -0000 1.18.2.4
@@ -49,6 +49,6 @@
#ifndef _PLATFORM_H_
#define _PLATFORM_H_
-#define TARVER_STR_PLATFORM "linux-2.2-libc6-gcc32-i586"
-#define TARVER_STR_BUILD_BRANCH "bingo-beta"
+#define TARVER_STR_PLATFORM "win32"
+#define TARVER_STR_BUILD_BRANCH "hxclient_1_3_0_neptunex_restricted"
#endif
Index: rmfftype.h
===================================================================
RCS file: /cvsroot/common/include/rmfftype.h,v
retrieving revision 1.5.8.4
retrieving revision 1.5.8.5
diff -u -d -r1.5.8.4 -r1.5.8.5
--- rmfftype.h 9 Jul 2004 01:45:13 -0000 1.5.8.4
+++ rmfftype.h 18 Feb 2005 00:18:30 -0000 1.5.8.5
@@ -755,7 +755,7 @@
HX_INLINE BOOL RMUnpackUINT32Buffer(UINT8*& rpBuffer, UINT32& rulSize, UINT8*& rpBuf, UINT8* pBuf, UINT32 ulLen)
{
rulSize = RMUnpackUINT32(rpBuf);
- if (rpBuf-pBuf+rulSize > (int)ulLen) return FALSE;
+ if (rpBuf-pBuf+rulSize > ulLen) return FALSE;
rpBuffer = rpBuf;
rpBuf += rulSize;
return TRUE;
From liam_murray at helixcommunity.org Thu Feb 17 16:18:33 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Thu Feb 17 16:18:57 2005
Subject: [Common-cvs] include/platform/symbian symbiantypes.h, 1.8.8.3,
1.8.8.4
Message-ID:
Update of /cvsroot/common/include/platform/symbian
In directory cvs-new:/tmp/cvs-serv27807/include/platform/symbian
Modified Files:
Tag: hxclient_1_3_0_neptunex
symbiantypes.h
Log Message:
patches from dextratech; these get rid of unused variable warnings and similar
Index: symbiantypes.h
===================================================================
RCS file: /cvsroot/common/include/platform/symbian/symbiantypes.h,v
retrieving revision 1.8.8.3
retrieving revision 1.8.8.4
diff -u -d -r1.8.8.3 -r1.8.8.4
--- symbiantypes.h 9 Jul 2004 01:44:59 -0000 1.8.8.3
+++ symbiantypes.h 18 Feb 2005 00:18:30 -0000 1.8.8.4
@@ -61,7 +61,8 @@
{
double ret;
- if (a >= 0x80000000)
+ //if (a >= 0x80000000)
+ if (a & 0x80000000)
{
ret = (double)(a & 0x7fffffff);
ret += 2147483648.0;
From kaiso at helixcommunity.org Fri Feb 18 00:39:42 2005
From: kaiso at helixcommunity.org (kaiso@helixcommunity.org)
Date: Fri Feb 18 00:39:43 2005
Subject: [Common-cvs] www/2002/devdocs buildtools.html.ja,NONE,1.1
Message-ID:
Update of /cvsroot/common/www/2002/devdocs
In directory cvs-new:/tmp/cvs-serv20800/2002/devdocs
Added Files:
buildtools.html.ja
Log Message:
Initial checkin of Japanese translated document.
Original revision: 1.8
--- NEW FILE: buildtools.html.ja ---
(This appears to be a binary file; contents omitted.)
From kaiso at helixcommunity.org Fri Feb 18 00:40:55 2005
From: kaiso at helixcommunity.org (kaiso@helixcommunity.org)
Date: Fri Feb 18 00:40:56 2005
Subject: [Common-cvs] www/2002/devdocs faq_buildsystem.html.ja,NONE,1.1
Message-ID:
Update of /cvsroot/common/www/2002/devdocs
In directory cvs-new:/tmp/cvs-serv22872/2002/devdocs
Added Files:
faq_buildsystem.html.ja
Log Message:
Initial checkin of Japanese translated document.
Original revision: 1.3
--- NEW FILE: faq_buildsystem.html.ja ---
(This appears to be a binary file; contents omitted.)
From kaiso at helixcommunity.org Fri Feb 18 00:41:50 2005
From: kaiso at helixcommunity.org (kaiso@helixcommunity.org)
Date: Fri Feb 18 00:41:51 2005
Subject: [Common-cvs] www/2002/devdocs sourcecode.html.ja,NONE,1.1
Message-ID:
Update of /cvsroot/common/www/2002/devdocs
In directory cvs-new:/tmp/cvs-serv24552/2002/devdocs
Added Files:
sourcecode.html.ja
Log Message:
Initial checkin of Japanese translated document.
Original revision: 1.1
--- NEW FILE: sourcecode.html.ja ---
(This appears to be a binary file; contents omitted.)
From kaiso at helixcommunity.org Fri Feb 18 00:42:41 2005
From: kaiso at helixcommunity.org (kaiso@helixcommunity.org)
Date: Fri Feb 18 00:42:43 2005
Subject: [Common-cvs] www/2004/devdocs quickstart.html.ja,NONE,1.1
Message-ID:
Update of /cvsroot/common/www/2004/devdocs
In directory cvs-new:/tmp/cvs-serv25921/2004/devdocs
Added Files:
quickstart.html.ja
Log Message:
Initial checkin of Japanese translated document.
Original revision: 1.17
--- NEW FILE: quickstart.html.ja ---
(This appears to be a binary file; contents omitted.)
From kaiso at helixcommunity.org Fri Feb 18 00:44:11 2005
From: kaiso at helixcommunity.org (kaiso@helixcommunity.org)
Date: Fri Feb 18 00:44:13 2005
Subject: [Common-cvs] www index.html.ja,NONE,1.1
Message-ID:
Update of /cvsroot/common/www
In directory cvs-new:/tmp/cvs-serv28133
Added Files:
index.html.ja
Log Message:
Initial checkin of Japanese translated document.
Original revision: 1.7
--- NEW FILE: index.html.ja ---
(This appears to be a binary file; contents omitted.)
From bobclark at helixcommunity.org Sat Feb 19 13:52:14 2005
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Sat Feb 19 13:52:16 2005
Subject: [Common-cvs] include hxmutexlock.h,1.6,1.7
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv2331
Modified Files:
hxmutexlock.h
Log Message:
implementation of mutex lock functions added for Macintosh OS X (should be applicable for any PowerPC gcc platform); cr Dean Collins
Index: hxmutexlock.h
===================================================================
RCS file: /cvsroot/common/include/hxmutexlock.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hxmutexlock.h 22 Jul 2004 16:08:51 -0000 1.6
+++ hxmutexlock.h 19 Feb 2005 21:52:11 -0000 1.7
@@ -437,6 +437,43 @@
/***********************************************************************
+ * Macintosh OS X
+ *
+ * Implementation Notes:
+ * Uses assembly mutex
+ * GCC inline-assembly syntax
+ *
+ */
+#elif defined _MAC_UNIX
+
+inline static int
+_HXMutexSetBit(int* pNum)
+{
+ volatile int result;
+ volatile int hold;
+ volatile int newval;
+ __asm__ __volatile__ (
+"retry: lwarx %3, 0, %2;\n" // hold = *pNum
+" li %4, 1;\n" // newval = 1
+" stwcx. %4, 0, %2;\n" // *pNum = newval (if pNum has not been
+ // corrupted by another thread between
+ // lwarx and stwcx.)
+" bne- retry;\n" // if pNum HAS been corrupted by another thread, retry.
+" mr %0, %3;\n" // result = hold (i.e. old *pNum)
+ : "=b" (result)
+ : "0" (result), "b" (pNum), "b" (hold), "b" (newval)
+ : "cc", "memory"
+ );
+
+ return result;
+}
+
+#define _HXMutexYieldCPUIfNeeded() /* not needed */
+#define _HXMutexClearBit(pLock) (*(int*)pLock = 0)
+#define _HXMutexInitBit(pLock) _HXMutexClearBit(pLock)
+#define _HXMutexDestroyBit(pLock) /* not needed */
+
+/***********************************************************************
* Misc. Unix / x86 (Linux, FreeBSD...)
*
* Implementation Notes:
From liam_murray at helixcommunity.org Tue Feb 22 13:04:34 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Tue Feb 22 13:04:36 2005
Subject: [Common-cvs] container/pub chxmapguidtoobj.h,1.11,1.12
Message-ID:
Update of /cvsroot/common/container/pub
In directory cvs-new:/tmp/cvs-serv15057/pub
Modified Files:
chxmapguidtoobj.h
Log Message:
fix to prevent returning ref to temporary when !HELIX_FEATURE_FULLGUID
Index: chxmapguidtoobj.h
===================================================================
RCS file: /cvsroot/common/container/pub/chxmapguidtoobj.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- chxmapguidtoobj.h 9 Jul 2004 18:21:27 -0000 1.11
+++ chxmapguidtoobj.h 22 Feb 2005 21:04:31 -0000 1.12
@@ -92,7 +92,11 @@
typedef GUID key_type;
typedef const GUID& key_arg_type;
typedef const GUID& key_ref_type;
- inline static key_arg_type key_nil() { return (key_arg_type)GUID_NULL;}
+#if !defined (HELIX_FEATURE_FULLGUID)
+ inline static key_arg_type key_nil() { static const key_type val = GUID_NULL; return val;}
+#else
+ inline static key_arg_type key_nil() { return GUID_NULL;}
+#endif
typedef void* value_type;
typedef void* value_arg_type;
From liam_murray at helixcommunity.org Tue Feb 22 13:08:36 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Tue Feb 22 13:08:38 2005
Subject: [Common-cvs] container/pub chxmapguidtoobj.h,1.9.32.3,1.9.32.4
Message-ID:
Update of /cvsroot/common/container/pub
In directory cvs-new:/tmp/cvs-serv15945/pub
Modified Files:
Tag: hxclient_1_3_0_neptunex
chxmapguidtoobj.h
Log Message:
prevent returning reference to temporary when !HELIX_FEATURE_FULLGUID
Index: chxmapguidtoobj.h
===================================================================
RCS file: /cvsroot/common/container/pub/chxmapguidtoobj.h,v
retrieving revision 1.9.32.3
retrieving revision 1.9.32.4
diff -u -d -r1.9.32.3 -r1.9.32.4
--- chxmapguidtoobj.h 9 Jul 2004 01:45:51 -0000 1.9.32.3
+++ chxmapguidtoobj.h 22 Feb 2005 21:08:34 -0000 1.9.32.4
@@ -92,7 +92,11 @@
typedef GUID key_type;
typedef const GUID& key_arg_type;
typedef const GUID& key_ref_type;
- inline static key_arg_type key_nil() { return (key_arg_type)GUID_NULL;}
+#if !defined (HELIX_FEATURE_FULLGUID)
+ inline static key_arg_type key_nil() { static const key_type val = GUID_NULL; return val;}
+#else
+ inline static key_arg_type key_nil() { return GUID_NULL;}
+#endif
typedef void* value_type;
typedef void* value_arg_type;
From jc at helixcommunity.org Tue Feb 22 20:27:44 2005
From: jc at helixcommunity.org (jc@helixcommunity.org)
Date: Tue Feb 22 20:27:45 2005
Subject: [Common-cvs] netio iresolv.cpp,1.20.2.1,1.20.2.2
Message-ID:
Update of /cvsroot/common/netio
In directory cvs-new:/tmp/cvs-serv31712
Modified Files:
Tag: SERVER_11_0_STABLE
iresolv.cpp
Log Message:
When we need to resolve a host name, we send out both an IPv4 and IPv6
query. If one comes back and then the retransmission timer pops, the
query that already returned will have had its query id (qid) cleared
but in Func() we try to delete it again anyway andwhen we do this,
CIntResolver::DelQuery() will do a Release() on the CNodeQuery class
which will down the road cause that class to get deleted prematurely
and we end up with a crash.
The qids are initialized in CIntResolver::NextQueryID() when the requests
are sentand are guaranteed non-zero. When a response comes in, the qid
responded to is deleted and cleared in CNodeQuery::HandleResponse(). In
CNodeQuery::Func(), when the timer pops, we need to check m_qidIN4 and
m_qidIN6 to make sure they have not already been cleared before we delete them.
This bug has only been seen on win32 because of socket layer issues but is not
platform specific.
CR: go
Index: iresolv.cpp
===================================================================
RCS file: /cvsroot/common/netio/iresolv.cpp,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -d -r1.20.2.1 -r1.20.2.2
--- iresolv.cpp 1 Feb 2005 16:48:03 -0000 1.20.2.1
+++ iresolv.cpp 23 Feb 2005 04:27:42 -0000 1.20.2.2
@@ -606,15 +606,21 @@
if (m_family == HX_SOCK_FAMILY_INANY || m_family == HX_SOCK_FAMILY_IN4)
{
- m_pOwner->DelQuery(m_qidIN4, this);
- m_qidIN4 = 0;
- SendRequest(HX_SOCK_FAMILY_IN4);
+ if (m_qidIN4)
+ {
+ m_pOwner->DelQuery(m_qidIN4, this);
+ m_qidIN4 = 0;
+ SendRequest(HX_SOCK_FAMILY_IN4);
+ }
}
if (m_family == HX_SOCK_FAMILY_INANY || m_family == HX_SOCK_FAMILY_IN6)
{
- m_pOwner->DelQuery(m_qidIN6, this);
- m_qidIN6 = 0;
- SendRequest(HX_SOCK_FAMILY_IN6);
+ if (m_qidIN6)
+ {
+ m_pOwner->DelQuery(m_qidIN6, this);
+ m_qidIN6 = 0;
+ SendRequest(HX_SOCK_FAMILY_IN6);
+ }
}
Release();
return HXR_OK;
From jc at helixcommunity.org Tue Feb 22 20:41:43 2005
From: jc at helixcommunity.org (jc@helixcommunity.org)
Date: Tue Feb 22 20:41:46 2005
Subject: [Common-cvs] netio iresolv.cpp,1.22,1.23
Message-ID:
Update of /cvsroot/common/netio
In directory cvs-new:/tmp/cvs-serv16970
Modified Files:
iresolv.cpp
Log Message:
iWhen we need to resolve a host name, we send out both an IPv4 and IPv6
query. If one comes back and then the retransmission timer pops, the
query that already returned will have had its query id (qid) cleared
but in Func() we try to delete it again anyway andwhen we do this,
CIntResolver::DelQuery() will do a Release() on the CNodeQuery class
which will down the road cause that class to get deleted prematurely
and we end up with a crash.
The qids are initialized in CIntResolver::NextQueryID() when the requests
are sentand are guaranteed non-zero. When a response comes in, the qid
responded to is deleted and cleared in CNodeQuery::HandleResponse(). In
CNodeQuery::Func(), when the timer pops, we need to check m_qidIN4 and
m_qidIN6 to make sure they have not already been cleared before we delete them.
This bug has only been seen on win32 because of socket layer issues but is not
platform specific.
CR: go
Index: iresolv.cpp
===================================================================
RCS file: /cvsroot/common/netio/iresolv.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- iresolv.cpp 1 Feb 2005 16:50:47 -0000 1.22
+++ iresolv.cpp 23 Feb 2005 04:41:41 -0000 1.23
@@ -607,15 +607,21 @@
if (m_family == HX_SOCK_FAMILY_INANY || m_family == HX_SOCK_FAMILY_IN4)
{
- m_pOwner->DelQuery(m_qidIN4, this);
- m_qidIN4 = 0;
- SendRequest(HX_SOCK_FAMILY_IN4);
+ if (m_qidIN4)
+ {
+ m_pOwner->DelQuery(m_qidIN4, this);
+ m_qidIN4 = 0;
+ SendRequest(HX_SOCK_FAMILY_IN4);
+ }
}
if (m_family == HX_SOCK_FAMILY_INANY || m_family == HX_SOCK_FAMILY_IN6)
{
- m_pOwner->DelQuery(m_qidIN6, this);
- m_qidIN6 = 0;
- SendRequest(HX_SOCK_FAMILY_IN6);
+ if (m_qidIN6)
+ {
+ m_pOwner->DelQuery(m_qidIN6, this);
+ m_qidIN6 = 0;
+ SendRequest(HX_SOCK_FAMILY_IN6);
+ }
}
Release();
return HXR_OK;
From liam_murray at helixcommunity.org Wed Feb 23 10:49:41 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Wed Feb 23 10:49:43 2005
Subject: [Common-cvs] dbgtool/pub multilog.h,1.2.32.3,1.2.32.4
Message-ID:
Update of /cvsroot/common/dbgtool/pub
In directory cvs-new:/tmp/cvs-serv28878
Modified Files:
Tag: hxclient_1_3_0_neptunex
multilog.h
Log Message:
dextratech patch; part of effort to get rid of compiler warnings
Index: multilog.h
===================================================================
RCS file: /cvsroot/common/dbgtool/pub/multilog.h,v
retrieving revision 1.2.32.3
retrieving revision 1.2.32.4
diff -u -d -r1.2.32.3 -r1.2.32.4
--- multilog.h 9 Jul 2004 01:46:15 -0000 1.2.32.3
+++ multilog.h 23 Feb 2005 18:49:39 -0000 1.2.32.4
@@ -101,4 +101,7 @@
} \
}
+inline void MLOG_DoNothing(...) {/*do nothing*/};
+
+
#endif
From liam_murray at helixcommunity.org Wed Feb 23 10:50:47 2005
From: liam_murray at helixcommunity.org (liam_murray@helixcommunity.org)
Date: Wed Feb 23 10:50:48 2005
Subject: [Common-cvs] dbgtool/pub multilog.h,1.4,1.5
Message-ID:
Update of /cvsroot/common/dbgtool/pub
In directory cvs-new:/tmp/cvs-serv30678
Modified Files:
multilog.h
Log Message:
dextratech patch; part of effort to get rid of compiler warnings
Index: multilog.h
===================================================================
RCS file: /cvsroot/common/dbgtool/pub/multilog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- multilog.h 9 Jul 2004 18:21:50 -0000 1.4
+++ multilog.h 23 Feb 2005 18:50:45 -0000 1.5
@@ -101,4 +101,7 @@
} \
}
+inline void MLOG_DoNothing(...) {/*do nothing*/};
+
+
#endif
From dcollins at helixcommunity.org Thu Feb 24 09:02:03 2005
From: dcollins at helixcommunity.org (dcollins@helixcommunity.org)
Date: Thu Feb 24 09:02:05 2005
Subject: [Common-cvs] build/BIF helix.bif,1.502,1.503
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv15808
Modified Files:
helix.bif
Log Message:
Bubble-over from 11_0_RN the definition of a server_engine_bin_nodist_static
target, used for server profiling.
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -d -r1.502 -r1.503
--- helix.bif 14 Feb 2005 15:11:42 -0000 1.502
+++ helix.bif 24 Feb 2005 17:02:01 -0000 1.503
@@ -10594,6 +10594,31 @@
+ server_engine_bin_nodist_libs
+
+
+
+
+
+
+
+ unix win32
+
+
+
+ server_engine_bin_nodist
+
+
+
+ serverplugins
+ server_engine_bin_nodist_libs
+
+
+
+
+
+
+
server_protocol_rtsp
server_protocol_http
server_protocol_cloaked
From jaiswal at helixcommunity.org Thu Feb 24 10:23:34 2005
From: jaiswal at helixcommunity.org (jaiswal@helixcommunity.org)
Date: Thu Feb 24 10:23:35 2005
Subject: [Common-cvs] build/BIF helix.bif,1.503,1.504
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv19158
Modified Files:
helix.bif
Log Message:
Added slowcopy utility
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -d -r1.503 -r1.504
--- helix.bif 24 Feb 2005 17:02:01 -0000 1.503
+++ helix.bif 24 Feb 2005 18:23:31 -0000 1.504
@@ -1893,6 +1893,24 @@
datatype_common_filewriter
+
+
+
+
+ win32 unix
+
+
+
+
+
+
+ common_include
+
+
+
+ common_system
+
+
From ping at helixcommunity.org Fri Feb 25 14:34:37 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Feb 25 14:34:38 2005
Subject: [Common-cvs] include hxresult.h,1.28,1.29
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv6138
Modified Files:
hxresult.h
Log Message:
changed PNR_WARNING to HXR_WARNING
Index: hxresult.h
===================================================================
RCS file: /cvsroot/common/include/hxresult.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- hxresult.h 26 Jan 2005 04:16:40 -0000 1.28
+++ hxresult.h 25 Feb 2005 22:34:35 -0000 1.29
@@ -166,7 +166,7 @@
#define HXR_ALREADY_INITIALIZED MAKE_HX_RESULT(1,SS_GLO,32) // 80040020
#define HXR_NOT_SUPPORTED MAKE_HX_RESULT(1,SS_GLO,33) // 80040021
#define HXR_S_FALSE MAKE_HX_RESULT(0,SS_GLO,34) // 00040022
-#define PNR_WARNING MAKE_HX_RESULT(0,SS_GLO,35) // 00040023
+#define HXR_WARNING MAKE_HX_RESULT(0,SS_GLO,35) // 00040023
#define HXR_BUFFERING MAKE_HX_RESULT(0,SS_NET,0) // 00040040
#define HXR_PAUSED MAKE_HX_RESULT(0,SS_NET,1) // 00040041
From ping at helixcommunity.org Fri Feb 25 14:58:23 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Feb 25 14:58:26 2005
Subject: [Common-cvs] util/pub HXErrorCodeStrings.h,NONE,1.1
Message-ID:
Update of /cvsroot/common/util/pub
In directory cvs-new:/tmp/cvs-serv22651/pub
Added Files:
HXErrorCodeStrings.h
Log Message:
Moved HXErrorCodeStrings.c from player/hxclientkit so it can be shared among other products(i.e. splay.exe)
--- NEW FILE: HXErrorCodeStrings.h ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: HXErrorCodeStrings.h,v 1.1 2005/02/25 22:58:20 ping Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef _HXERROR_CODE_STRINGS_H_
#define _HXERROR_CODE_STRINGS_H_
#ifdef __cplusplus
extern "C" {
#endif
const char* HXErrorCodeToString( UINT32 ulHXCode );
#ifdef __cplusplus
}
#endif
#endif
From ping at helixcommunity.org Fri Feb 25 14:58:22 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Feb 25 14:58:27 2005
Subject: [Common-cvs] util HXErrorCodeStrings.c,NONE,1.1 Umakefil,1.40,1.41
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv22651
Modified Files:
Umakefil
Added Files:
HXErrorCodeStrings.c
Log Message:
Moved HXErrorCodeStrings.c from player/hxclientkit so it can be shared among other products(i.e. splay.exe)
--- NEW FILE: HXErrorCodeStrings.c ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: HXErrorCodeStrings.c,v 1.1 2005/02/25 22:58:20 ping Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#include "hxtypes.h"
#include "hxresult.h"
#include "HXErrorCodeStrings.h"
typedef struct MapHXCodeToKeyRecord
{
UINT32 ulHXCode;
char* pKeyString;
} MapHXCodeToKeyRecord;
static MapHXCodeToKeyRecord const HXCodeToKeyMap[] =
{
{ HXR_NOTIMPL, "HXR_NOTIMPL" }, // 80004001
{ HXR_OUTOFMEMORY, "HXR_OUTOFMEMORY" }, // 8007000e
{ HXR_INVALID_PARAMETER, "HXR_INVALID_PARAMETER" }, // 80070057
{ HXR_NOINTERFACE, "HXR_NOINTERFACE" }, // 80004002
{ HXR_POINTER, "HXR_POINTER" }, // 80004003
{ HXR_HANDLE, "HXR_HANDLE" }, // 80070006
{ HXR_ABORT, "HXR_ABORT" }, // 80004004
{ HXR_FAIL, "HXR_FAIL" }, // 80004005
{ HXR_ACCESSDENIED, "HXR_ACCESSDENIED" }, // 80070005
{ HXR_IGNORE, "HXR_IGNORE" }, // 80000006
{ HXR_INVALID_OPERATION, "HXR_INVALID_OPERATION" }, // 80040004
{ HXR_INVALID_VERSION, "HXR_INVALID_VERSION" }, // 80040005
{ HXR_INVALID_REVISION, "HXR_INVALID_REVISION" }, // 80040006
{ HXR_NOT_INITIALIZED, "HXR_NOT_INITIALIZED" }, // 80040007
{ HXR_DOC_MISSING, "HXR_DOC_MISSING" }, // 80040008
{ HXR_UNEXPECTED, "HXR_UNEXPECTED" }, // 80040009
{ HXR_INCOMPLETE, "HXR_INCOMPLETE" }, // 8004000c
{ HXR_BUFFERTOOSMALL, "HXR_BUFFERTOOSMALL" }, // 8004000d
{ HXR_UNSUPPORTED_VIDEO, "HXR_UNSUPPORTED_VIDEO" }, // 8004000e
{ HXR_UNSUPPORTED_AUDIO, "HXR_UNSUPPORTED_AUDIO" }, // 8004000f
{ HXR_INVALID_BANDWIDTH, "HXR_INVALID_BANDWIDTH" }, // 80040010
{ HXR_NO_RENDERER, "HXR_NO_RENDERER" }, // 80040011
{ HXR_NO_FILEFORMAT, "HXR_NO_FILEFORMAT" }, // 80040011
{ HXR_MISSING_COMPONENTS, "HXR_MISSING_COMPONENTS" }, // 80040011
{ HXR_ELEMENT_NOT_FOUND, "HXR_ELEMENT_NOT_FOUND" }, // 00040012
{ HXR_NOCLASS, "HXR_NOCLASS" }, // 00040013
{ HXR_CLASS_NOAGGREGATION, "HXR_CLASS_NOAGGREGATION" }, // 00040014
{ HXR_NOT_LICENSED, "HXR_NOT_LICENSED" }, // 80040015
{ HXR_NO_FILESYSTEM, "HXR_NO_FILESYSTEM" }, // 80040016
{ HXR_REQUEST_UPGRADE, "HXR_REQUEST_UPGRADE" }, // 80040017
{ HXR_CHECK_RIGHTS, "HXR_CHECK_RIGHTS" }, // 80040018
{ HXR_RESTORE_SERVER_DENIED, "HXR_RESTORE_SERVER_DENIED" }, // 80040019
{ HXR_DEBUGGER_DETECTED, "HXR_DEBUGGER_DETECTED" }, // 8004001a
{ HXR_RESTORE_SERVER_CONNECT, "HXR_RESTORE_SERVER_CONNECT" }, // 8004005c
{ HXR_RESTORE_SERVER_TIMEOUT, "HXR_RESTORE_SERVER_TIMEOUT" }, // 8004005d
{ HXR_REVOKE_SERVER_CONNECT, "HXR_REVOKE_SERVER_CONNECT" }, // 8004005e
{ HXR_REVOKE_SERVER_TIMEOUT, "HXR_REVOKE_SERVER_TIMEOUT" }, // 8004005f
{ HXR_VIEW_RIGHTS_NODRM, "HXR_VIEW_RIGHTS_NODRM" }, // 800401cd
{ HXR_VSRC_NODRM, "HXR_VSRC_NODRM" }, // 800401d3
{ HXR_AWAITING_LICENSE, "HXR_AWAITING_LICENSE" }, // 8004001f
{ HXR_ALREADY_INITIALIZED, "HXR_ALREADY_INITIALIZED" }, // 80040020
{ HXR_NOT_SUPPORTED, "HXR_NOT_SUPPORTED" }, // 80040021
{ HXR_S_FALSE, "HXR_S_FALSE" }, // 00040022
{ HXR_WARNING, "HXR_WARNING" }, // 00040023
{ HXR_BUFFERING, "HXR_BUFFERING" }, // 00040040
{ HXR_PAUSED, "HXR_PAUSED" }, // 00040041
{ HXR_NO_DATA, "HXR_NO_DATA" }, // 00040042
{ HXR_STREAM_DONE, "HXR_STREAM_DONE" }, // 00040043
{ HXR_NET_SOCKET_INVALID, "HXR_NET_SOCKET_INVALID" }, // 80040043
{ HXR_NET_CONNECT, "HXR_NET_CONNECT" }, // 80040044
{ HXR_BIND, "HXR_BIND" }, // 80040045
{ HXR_SOCKET_CREATE, "HXR_SOCKET_CREATE" }, // 80040046
{ HXR_INVALID_HOST, "HXR_INVALID_HOST" }, // 80040047
{ HXR_NET_READ, "HXR_NET_READ" }, // 80040048
{ HXR_NET_WRITE, "HXR_NET_WRITE" }, // 80040049
{ HXR_NET_UDP, "HXR_NET_UDP" }, // 8004004a
{ HXR_RETRY, "HXR_RETRY" }, // 8004004b
{ HXR_SERVER_TIMEOUT, "HXR_SERVER_TIMEOUT" }, // 8004004c
{ HXR_SERVER_DISCONNECTED, "HXR_SERVER_DISCONNECTED" }, // 8004004d
{ HXR_WOULD_BLOCK, "HXR_WOULD_BLOCK" }, // 8004004e
{ HXR_GENERAL_NONET, "HXR_GENERAL_NONET" }, // 8004004f
{ HXR_BLOCK_CANCELED, "HXR_BLOCK_CANCELED" }, // 80040050
{ HXR_MULTICAST_JOIN, "HXR_MULTICAST_JOIN" }, // 80040051
{ HXR_GENERAL_MULTICAST, "HXR_GENERAL_MULTICAST" }, // 80040052
{ HXR_MULTICAST_UDP, "HXR_MULTICAST_UDP" }, // 80040053
{ HXR_AT_INTERRUPT, "HXR_AT_INTERRUPT" }, // 80040054
{ HXR_MSG_TOOLARGE, "HXR_MSG_TOOLARGE" }, // 80040055
{ HXR_NET_TCP, "HXR_NET_TCP" }, // 80040056
{ HXR_TRY_AUTOCONFIG, "HXR_TRY_AUTOCONFIG" }, // 80040057
{ HXR_NOTENOUGH_BANDWIDTH, "HXR_NOTENOUGH_BANDWIDTH" }, // 80040058
{ HXR_HTTP_CONNECT, "HXR_HTTP_CONNECT" }, // 80040059
{ HXR_PORT_IN_USE, "HXR_PORT_IN_USE" }, // 8004005a
{ HXR_LOADTEST_NOT_SUPPORTED, "HXR_LOADTEST_NOT_SUPPORTED" }, // 8004005b
{ HXR_TCP_CONNECT, "HXR_TCP_CONNECT" }, // 00040060
{ HXR_TCP_RECONNECT, "HXR_TCP_RECONNECT" }, // 00040061
{ HXR_TCP_FAILED, "HXR_TCP_FAILED" }, // 80040062
{ HXR_AUTH_SOCKET_CREATE_FAILURE, "HXR_AUTH_SOCKET_CREATE_FAILURE" }, // 80040063
{ HXR_AUTH_TCP_CONNECT_FAILURE, "HXR_AUTH_TCP_CONNECT_FAILURE" }, // 80040064
{ HXR_AUTH_TCP_CONNECT_TIMEOUT, "HXR_AUTH_TCP_CONNECT_TIMEOUT" }, // 80040065
{ HXR_AUTH_FAILURE, "HXR_AUTH_FAILURE" }, // 80040066
{ HXR_AUTH_REQ_PARAMETER_MISSING, "HXR_AUTH_REQ_PARAMETER_MISSING" }, // 80040067
{ HXR_DNS_RESOLVE_FAILURE, "HXR_DNS_RESOLVE_FAILURE" }, // 80040068
{ HXR_AUTH_SUCCEEDED, "HXR_AUTH_SUCCEEDED" }, // 00040068
{ HXR_PULL_AUTHENTICATION_FAILED, "HXR_PULL_AUTHENTICATION_FAILED" }, // 80040069
{ HXR_BIND_ERROR, "HXR_BIND_ERROR" }, // 8004006a
{ HXR_PULL_PING_TIMEOUT, "HXR_PULL_PING_TIMEOUT" }, // 8004006b
{ HXR_AUTH_TCP_FAILED, "HXR_AUTH_TCP_FAILED" }, // 8004006c
{ HXR_UNEXPECTED_STREAM_END, "HXR_UNEXPECTED_STREAM_END" }, // 8004006d
{ HXR_AUTH_READ_TIMEOUT, "HXR_AUTH_READ_TIMEOUT" }, // 8004006e
{ HXR_AUTH_CONNECTION_FAILURE, "HXR_AUTH_CONNECTION_FAILURE" }, // 8004006f
{ HXR_BLOCKED, "HXR_BLOCKED" }, // 80040070
{ HXR_NOTENOUGH_PREDECBUF, "HXR_NOTENOUGH_PREDECBUF" }, // 80040071
{ HXR_AT_END, "HXR_AT_END" }, // 00040080
{ HXR_INVALID_FILE, "HXR_INVALID_FILE" }, // 80040081
{ HXR_INVALID_PATH, "HXR_INVALID_PATH" }, // 80040082
{ HXR_RECORD, "HXR_RECORD" }, // 80040083
{ HXR_RECORD_WRITE, "HXR_RECORD_WRITE" }, // 80040084
{ HXR_TEMP_FILE, "HXR_TEMP_FILE" }, // 80040085
{ HXR_ALREADY_OPEN, "HXR_ALREADY_OPEN" }, // 80040086
{ HXR_SEEK_PENDING, "HXR_SEEK_PENDING" }, // 80040087
{ HXR_CANCELLED, "HXR_CANCELLED" }, // 80040088
{ HXR_FILE_NOT_FOUND, "HXR_FILE_NOT_FOUND" }, // 80040089
{ HXR_WRITE_ERROR, "HXR_WRITE_ERROR" }, // 8004008a
{ HXR_FILE_EXISTS, "HXR_FILE_EXISTS" }, // 8004008b
{ HXR_FILE_NOT_OPEN, "HXR_FILE_NOT_OPEN" }, // 8004008c
{ HXR_ADVISE_PREFER_LINEAR, "HXR_ADVISE_PREFER_LINEAR" }, // 0004008d
{ HXR_PARSE_ERROR, "HXR_PARSE_ERROR" }, // 8004008e
{ HXR_ADVISE_NOASYNC_SEEK, "HXR_ADVISE_NOASYNC_SEEK" }, // 0004008f
{ HXR_HEADER_PARSE_ERROR, "HXR_HEADER_PARSE_ERROR" }, // 80040090
{ HXR_CORRUPT_FILE , "HXR_CORRUPT_FILE " }, // 80040091
{ HXR_BAD_SERVER, "HXR_BAD_SERVER" }, // 800400c0
{ HXR_ADVANCED_SERVER, "HXR_ADVANCED_SERVER" }, // 800400c1
{ HXR_OLD_SERVER, "HXR_OLD_SERVER" }, // 800400c2
{ HXR_REDIRECTION, "HXR_REDIRECTION" }, // 000400c3
{ HXR_SERVER_ALERT, "HXR_SERVER_ALERT" }, // 800400c4
{ HXR_PROXY, "HXR_PROXY" }, // 800400c5
{ HXR_PROXY_RESPONSE, "HXR_PROXY_RESPONSE" }, // 800400c6
{ HXR_ADVANCED_PROXY, "HXR_ADVANCED_PROXY" }, // 800400c7
{ HXR_OLD_PROXY, "HXR_OLD_PROXY" }, // 800400c8
{ HXR_INVALID_PROTOCOL, "HXR_INVALID_PROTOCOL" }, // 800400c9
{ HXR_INVALID_URL_OPTION, "HXR_INVALID_URL_OPTION" }, // 800400ca
{ HXR_INVALID_URL_HOST, "HXR_INVALID_URL_HOST" }, // 800400cb
{ HXR_INVALID_URL_PATH, "HXR_INVALID_URL_PATH" }, // 800400cc
{ HXR_HTTP_CONTENT_NOT_FOUND, "HXR_HTTP_CONTENT_NOT_FOUND" }, // 800400cd
{ HXR_NOT_AUTHORIZED, "HXR_NOT_AUTHORIZED" }, // 800400ce
{ HXR_UNEXPECTED_MSG, "HXR_UNEXPECTED_MSG" }, // 800400cf
{ HXR_BAD_TRANSPORT, "HXR_BAD_TRANSPORT" }, // 800400d0
{ HXR_NO_SESSION_ID, "HXR_NO_SESSION_ID" }, // 800400d1
{ HXR_PROXY_DNR, "HXR_PROXY_DNR" }, // 800400d2
{ HXR_PROXY_NET_CONNECT, "HXR_PROXY_NET_CONNECT" }, // 800400d3
{ HXR_AGGREGATE_OP_NOT_ALLOWED, "HXR_AGGREGATE_OP_NOT_ALLOWED" }, // 800400d4
{ HXR_RIGHTS_EXPIRED, "HXR_RIGHTS_EXPIRED" }, // 800400d5
{ HXR_NOT_MODIFIED, "HXR_NOT_MODIFIED" }, // 800400d6
{ HXR_FORBIDDEN, "HXR_FORBIDDEN" }, // 800400d7
{ HXR_AUDIO_DRIVER, "HXR_AUDIO_DRIVER" }, // 80040100
{ HXR_LATE_PACKET, "HXR_LATE_PACKET" }, // 80040101
{ HXR_OVERLAPPED_PACKET, "HXR_OVERLAPPED_PACKET" }, // 80040102
{ HXR_OUTOFORDER_PACKET, "HXR_OUTOFORDER_PACKET" }, // 80040103
{ HXR_NONCONTIGUOUS_PACKET, "HXR_NONCONTIGUOUS_PACKET" }, // 80040104
{ HXR_OPEN_NOT_PROCESSED, "HXR_OPEN_NOT_PROCESSED" }, // 80040140
{ HXR_WINDRAW_EXCEPTION, "HXR_WINDRAW_EXCEPTION" }, // 80040141
{ HXR_EXPIRED, "HXR_EXPIRED" }, // 80040180
{ HXR_INVALID_INTERLEAVER, "HXR_INVALID_INTERLEAVER" }, // 80040fc0
{ HXR_BAD_FORMAT, "HXR_BAD_FORMAT" }, // 80040fc1
{ HXR_CHUNK_MISSING, "HXR_CHUNK_MISSING" }, // 80040fc2
{ HXR_INVALID_STREAM, "HXR_INVALID_STREAM" }, // 80040fc3
{ HXR_DNR, "HXR_DNR" }, // 80040fc4
{ HXR_OPEN_DRIVER, "HXR_OPEN_DRIVER" }, // 80040fc5
{ HXR_UPGRADE, "HXR_UPGRADE" }, // 80040fc6
{ HXR_NOTIFICATION, "HXR_NOTIFICATION" }, // 80040fc7
{ HXR_NOT_NOTIFIED, "HXR_NOT_NOTIFIED" }, // 80040fc8
{ HXR_STOPPED, "HXR_STOPPED" }, // 80040fc9
{ HXR_CLOSED, "HXR_CLOSED" }, // 80040fca
{ HXR_INVALID_WAV_FILE, "HXR_INVALID_WAV_FILE" }, // 80040fcb
{ HXR_NO_SEEK, "HXR_NO_SEEK" }, // 80040fcc
{ HXR_DEC_INITED, "HXR_DEC_INITED" }, // 80040200
{ HXR_DEC_NOT_FOUND, "HXR_DEC_NOT_FOUND" }, // 80040201
{ HXR_DEC_INVALID, "HXR_DEC_INVALID" }, // 80040202
{ HXR_DEC_TYPE_MISMATCH, "HXR_DEC_TYPE_MISMATCH" }, // 80040203
{ HXR_DEC_INIT_FAILED, "HXR_DEC_INIT_FAILED" }, // 80040204
{ HXR_DEC_NOT_INITED, "HXR_DEC_NOT_INITED" }, // 80040205
{ HXR_DEC_DECOMPRESS, "HXR_DEC_DECOMPRESS" }, // 80040206
{ HXR_OBSOLETE_VERSION, "HXR_OBSOLETE_VERSION" }, // 80040207
{ HXR_ENC_FILE_TOO_SMALL, "HXR_ENC_FILE_TOO_SMALL" }, // 80040240
{ HXR_ENC_UNKNOWN_FILE, "HXR_ENC_UNKNOWN_FILE" }, // 80040241
{ HXR_ENC_BAD_CHANNELS, "HXR_ENC_BAD_CHANNELS" }, // 80040242
{ HXR_ENC_BAD_SAMPSIZE, "HXR_ENC_BAD_SAMPSIZE" }, // 80040243
{ HXR_ENC_BAD_SAMPRATE, "HXR_ENC_BAD_SAMPRATE" }, // 80040244
{ HXR_ENC_INVALID, "HXR_ENC_INVALID" }, // 80040245
{ HXR_ENC_NO_OUTPUT_FILE, "HXR_ENC_NO_OUTPUT_FILE" }, // 80040246
{ HXR_ENC_NO_INPUT_FILE, "HXR_ENC_NO_INPUT_FILE" }, // 80040247
{ HXR_ENC_NO_OUTPUT_PERMISSIONS, "HXR_ENC_NO_OUTPUT_PERMISSIONS" }, // 80040248
{ HXR_ENC_BAD_FILETYPE, "HXR_ENC_BAD_FILETYPE" }, // 80040249
{ HXR_ENC_INVALID_VIDEO, "HXR_ENC_INVALID_VIDEO" }, // 8004024a
{ HXR_ENC_INVALID_AUDIO, "HXR_ENC_INVALID_AUDIO" }, // 8004024b
{ HXR_ENC_NO_VIDEO_CAPTURE, "HXR_ENC_NO_VIDEO_CAPTURE" }, // 8004024c
{ HXR_ENC_INVALID_VIDEO_CAPTURE, "HXR_ENC_INVALID_VIDEO_CAPTURE" }, // 8004024d
{ HXR_ENC_NO_AUDIO_CAPTURE, "HXR_ENC_NO_AUDIO_CAPTURE" }, // 8004024e
{ HXR_ENC_INVALID_AUDIO_CAPTURE, "HXR_ENC_INVALID_AUDIO_CAPTURE" }, // 8004024f
{ HXR_ENC_TOO_SLOW_FOR_LIVE, "HXR_ENC_TOO_SLOW_FOR_LIVE" }, // 80040250
{ HXR_ENC_ENGINE_NOT_INITIALIZED, "HXR_ENC_ENGINE_NOT_INITIALIZED" }, // 80040251
{ HXR_ENC_CODEC_NOT_FOUND, "HXR_ENC_CODEC_NOT_FOUND" }, // 80040252
{ HXR_ENC_CODEC_NOT_INITIALIZED, "HXR_ENC_CODEC_NOT_INITIALIZED" }, // 80040253
{ HXR_ENC_INVALID_INPUT_DIMENSIONS, "HXR_ENC_INVALID_INPUT_DIMENSIONS" }, // 80040254
{ HXR_ENC_MESSAGE_IGNORED, "HXR_ENC_MESSAGE_IGNORED" }, // 80040255
{ HXR_ENC_NO_SETTINGS, "HXR_ENC_NO_SETTINGS" }, // 80040256
{ HXR_ENC_NO_OUTPUT_TYPES, "HXR_ENC_NO_OUTPUT_TYPES" }, // 80040257
{ HXR_ENC_IMPROPER_STATE, "HXR_ENC_IMPROPER_STATE" }, // 80040258
{ HXR_ENC_INVALID_SERVER, "HXR_ENC_INVALID_SERVER" }, // 80040259
{ HXR_ENC_INVALID_TEMP_PATH, "HXR_ENC_INVALID_TEMP_PATH" }, // 8004025a
{ HXR_ENC_MERGE_FAIL, "HXR_ENC_MERGE_FAIL" }, // 8004025b
{ HXR_BIN_DATA_NOT_FOUND, "HXR_BIN_DATA_NOT_FOUND" }, // 0004025c
{ HXR_BIN_END_OF_DATA, "HXR_BIN_END_OF_DATA" }, // 0004025d
{ HXR_BIN_DATA_PURGED, "HXR_BIN_DATA_PURGED" }, // 8004025e
{ HXR_BIN_FULL, "HXR_BIN_FULL" }, // 8004025f
{ HXR_BIN_OFFSET_PAST_END, "HXR_BIN_OFFSET_PAST_END" }, // 80040260
{ HXR_ENC_NO_ENCODED_DATA, "HXR_ENC_NO_ENCODED_DATA" }, // 80040261
{ HXR_ENC_INVALID_DLL, "HXR_ENC_INVALID_DLL" }, // 80040262
{ HXR_NOT_INDEXABLE, "HXR_NOT_INDEXABLE" }, // 80040263
{ HXR_ENC_NO_BROWSER, "HXR_ENC_NO_BROWSER" }, // 80040264
{ HXR_ENC_NO_FILE_TO_SERVER, "HXR_ENC_NO_FILE_TO_SERVER" }, // 80040265
{ HXR_ENC_INSUFFICIENT_DISK_SPACE, "HXR_ENC_INSUFFICIENT_DISK_SPACE" }, // 80040266
{ HXR_ENC_SAMPLE_DISCARDED, "HXR_ENC_SAMPLE_DISCARDED" }, // 00040267
{ HXR_ENC_RV10_FRAME_TOO_LARGE, "HXR_ENC_RV10_FRAME_TOO_LARGE" }, // 80040268
{ HXR_S_NOT_HANDLED, "HXR_S_NOT_HANDLED" }, // 00040269
{ HXR_S_END_OF_STREAM, "HXR_S_END_OF_STREAM" }, // 0004026a
{ HXR_S_JOBFILE_INCOMPLETE, "HXR_S_JOBFILE_INCOMPLETE" }, //
{ HXR_S_NOTHING_TO_SERIALIZE, "HXR_S_NOTHING_TO_SERIALIZE" }, //
{ HXR_SIZENOTSET, "HXR_SIZENOTSET" }, //
{ HXR_ALREADY_COMMITTED, "HXR_ALREADY_COMMITTED" }, //
{ HXR_BUFFERS_OUTSTANDING, "HXR_BUFFERS_OUTSTANDING" }, //
{ HXR_NOT_COMMITTED, "HXR_NOT_COMMITTED" }, //
{ HXR_SAMPLE_TIME_NOT_SET, "HXR_SAMPLE_TIME_NOT_SET" }, //
{ HXR_TIMEOUT, "HXR_TIMEOUT" }, //
{ HXR_WRONGSTATE, "HXR_WRONGSTATE" }, //
{ HXR_RMT_USAGE_ERROR, "HXR_RMT_USAGE_ERROR" }, // 800403c1
{ HXR_RMT_INVALID_ENDTIME, "HXR_RMT_INVALID_ENDTIME" }, // 800403c2
{ HXR_RMT_MISSING_INPUT_FILE, "HXR_RMT_MISSING_INPUT_FILE" }, // 800403c3
{ HXR_RMT_MISSING_OUTPUT_FILE, "HXR_RMT_MISSING_OUTPUT_FILE" }, // 800403c4
{ HXR_RMT_INPUT_EQUALS_OUTPUT_FILE, "HXR_RMT_INPUT_EQUALS_OUTPUT_FILE" }, // 800403c5
{ HXR_RMT_UNSUPPORTED_AUDIO_VERSION, "HXR_RMT_UNSUPPORTED_AUDIO_VERSION" }, // 800403c6
{ HXR_RMT_DIFFERENT_AUDIO, "HXR_RMT_DIFFERENT_AUDIO" }, // 800403c7
{ HXR_RMT_DIFFERENT_VIDEO, "HXR_RMT_DIFFERENT_VIDEO" }, // 800403c8
{ HXR_RMT_PASTE_MISSING_STREAM, "HXR_RMT_PASTE_MISSING_STREAM" }, // 800403c9
{ HXR_RMT_END_OF_STREAM, "HXR_RMT_END_OF_STREAM" }, // 800403ca
{ HXR_RMT_IMAGE_MAP_PARSE_ERROR, "HXR_RMT_IMAGE_MAP_PARSE_ERROR" }, // 800403cb
{ HXR_RMT_INVALID_IMAGEMAP_FILE, "HXR_RMT_INVALID_IMAGEMAP_FILE" }, // 800403cc
{ HXR_RMT_EVENT_PARSE_ERROR, "HXR_RMT_EVENT_PARSE_ERROR" }, // 800403cd
{ HXR_RMT_INVALID_EVENT_FILE, "HXR_RMT_INVALID_EVENT_FILE" }, // 800403ce
{ HXR_RMT_INVALID_OUTPUT_FILE, "HXR_RMT_INVALID_OUTPUT_FILE" }, // 800403cf
{ HXR_RMT_INVALID_DURATION, "HXR_RMT_INVALID_DURATION" }, // 800403d0
{ HXR_RMT_NO_DUMP_FILES, "HXR_RMT_NO_DUMP_FILES" }, // 800403d1
{ HXR_RMT_NO_EVENT_DUMP_FILE, "HXR_RMT_NO_EVENT_DUMP_FILE" }, // 800403d2
{ HXR_RMT_NO_IMAP_DUMP_FILE, "HXR_RMT_NO_IMAP_DUMP_FILE" }, // 800403d3
{ HXR_RMT_NO_DATA, "HXR_RMT_NO_DATA" }, // 800403d4
{ HXR_RMT_EMPTY_STREAM, "HXR_RMT_EMPTY_STREAM" }, // 800403d5
{ HXR_RMT_READ_ONLY_FILE, "HXR_RMT_READ_ONLY_FILE" }, // 800403d6
{ HXR_RMT_PASTE_MISSING_AUDIO_STREAM, "HXR_RMT_PASTE_MISSING_AUDIO_STREAM" }, // 800403d7
{ HXR_RMT_PASTE_MISSING_VIDEO_STREAM, "HXR_RMT_PASTE_MISSING_VIDEO_STREAM" }, // 800403d8
{ HXR_RMT_ENCRYPTED_CONTENT, "HXR_RMT_ENCRYPTED_CONTENT" }, // 800403d9
{ HXR_PROP_NOT_FOUND, "HXR_PROP_NOT_FOUND" }, // 80040281
{ HXR_PROP_NOT_COMPOSITE, "HXR_PROP_NOT_COMPOSITE" }, // 80040282
{ HXR_PROP_DUPLICATE, "HXR_PROP_DUPLICATE" }, // 80040283
{ HXR_PROP_TYPE_MISMATCH, "HXR_PROP_TYPE_MISMATCH" }, // 80040284
{ HXR_PROP_ACTIVE, "HXR_PROP_ACTIVE" }, // 80040285
{ HXR_PROP_INACTIVE, "HXR_PROP_INACTIVE" }, // 80040286
{ HXR_PROP_VAL_UNDERFLOW, "HXR_PROP_VAL_UNDERFLOW" }, // 80040287
{ HXR_PROP_VAL_OVERFLOW, "HXR_PROP_VAL_OVERFLOW" }, // 80040288
{ HXR_PROP_VAL_LT_LBOUND, "HXR_PROP_VAL_LT_LBOUND" }, // 80040289
{ HXR_PROP_VAL_GT_UBOUND, "HXR_PROP_VAL_GT_UBOUND" }, // 8004028a
{ HXR_PROP_DELETE_PENDING, "HXR_PROP_DELETE_PENDING" }, // 0004028b
{ HXR_COULDNOTINITCORE, "HXR_COULDNOTINITCORE" }, // 800401c1
{ HXR_PERFECTPLAY_NOT_SUPPORTED, "HXR_PERFECTPLAY_NOT_SUPPORTED" }, // 800401c2
{ HXR_NO_LIVE_PERFECTPLAY, "HXR_NO_LIVE_PERFECTPLAY" }, // 800401c3
{ HXR_PERFECTPLAY_NOT_ALLOWED, "HXR_PERFECTPLAY_NOT_ALLOWED" }, // 800401c4
{ HXR_NO_CODECS, "HXR_NO_CODECS" }, // 800401c5
{ HXR_SLOW_MACHINE, "HXR_SLOW_MACHINE" }, // 800401c6
{ HXR_FORCE_PERFECTPLAY, "HXR_FORCE_PERFECTPLAY" }, // 800401c7
{ HXR_INVALID_HTTP_PROXY_HOST, "HXR_INVALID_HTTP_PROXY_HOST" }, // 800401c8
{ HXR_INVALID_METAFILE, "HXR_INVALID_METAFILE" }, // 800401c9
{ HXR_BROWSER_LAUNCH, "HXR_BROWSER_LAUNCH" }, // 800401ca
{ HXR_VIEW_SOURCE_NOCLIP, "HXR_VIEW_SOURCE_NOCLIP" }, // 800401cb
{ HXR_VIEW_SOURCE_DISSABLED, "HXR_VIEW_SOURCE_DISSABLED" }, // 800401cc
{ HXR_TIMELINE_SUSPENDED, "HXR_TIMELINE_SUSPENDED" }, // 800401ce
{ HXR_BUFFER_NOT_AVAILABLE, "HXR_BUFFER_NOT_AVAILABLE" }, // 800401cf
{ HXR_COULD_NOT_DISPLAY, "HXR_COULD_NOT_DISPLAY" }, // 800401d0
{ HXR_VSRC_DISABLED, "HXR_VSRC_DISABLED" }, // 800401d1
{ HXR_VSRC_NOCLIP, "HXR_VSRC_NOCLIP" }, // 800401d2
{ HXR_RESOURCE_NOT_CACHED, "HXR_RESOURCE_NOT_CACHED" }, // 80040301
{ HXR_RESOURCE_NOT_FOUND, "HXR_RESOURCE_NOT_FOUND" }, // 80040302
{ HXR_RESOURCE_CLOSE_FILE_FIRST, "HXR_RESOURCE_CLOSE_FILE_FIRST" }, // 80040303
{ HXR_RESOURCE_NODATA, "HXR_RESOURCE_NODATA" }, // 80040304
{ HXR_RESOURCE_BADFILE, "HXR_RESOURCE_BADFILE" }, // 80040305
{ HXR_RESOURCE_PARTIALCOPY, "HXR_RESOURCE_PARTIALCOPY" }, // 80040306
{ HXR_PPV_NO_USER, "HXR_PPV_NO_USER" }, // 800402c0
{ HXR_PPV_GUID_READ_ONLY, "HXR_PPV_GUID_READ_ONLY" }, // 800402c1
{ HXR_PPV_GUID_COLLISION, "HXR_PPV_GUID_COLLISION" }, // 800402c2
{ HXR_REGISTER_GUID_EXISTS, "HXR_REGISTER_GUID_EXISTS" }, // 800402c3
{ HXR_PPV_AUTHORIZATION_FAILED, "HXR_PPV_AUTHORIZATION_FAILED" }, // 800402c4
{ HXR_PPV_OLD_PLAYER, "HXR_PPV_OLD_PLAYER" }, // 800402c5
{ HXR_PPV_ACCOUNT_LOCKED, "HXR_PPV_ACCOUNT_LOCKED" }, // 800402c6
{ HXR_PPV_DBACCESS_ERROR, "HXR_PPV_DBACCESS_ERROR" }, // 800402c8
{ HXR_PPV_USER_ALREADY_EXISTS, "HXR_PPV_USER_ALREADY_EXISTS" }, // 800402c9
{ HXR_UPG_AUTH_FAILED, "HXR_UPG_AUTH_FAILED" }, // 80040340
{ HXR_UPG_CERT_AUTH_FAILED, "HXR_UPG_CERT_AUTH_FAILED" }, // 80040341
{ HXR_UPG_CERT_EXPIRED, "HXR_UPG_CERT_EXPIRED" }, // 80040342
{ HXR_UPG_CERT_REVOKED, "HXR_UPG_CERT_REVOKED" }, // 80040343
{ HXR_UPG_RUP_BAD, "HXR_UPG_RUP_BAD" }, // 80040344
{ HXR_UPG_SYSTEM_BUSY, "HXR_UPG_SYSTEM_BUSY" }, // 80040345
{ HXR_AUTOCFG_SUCCESS, "HXR_AUTOCFG_SUCCESS" }, // 80040345
{ HXR_AUTOCFG_FAILED, "HXR_AUTOCFG_FAILED" }, // 80040345
{ HXR_AUTOCFG_ABORT, "HXR_AUTOCFG_ABORT" }, // 80040345
{ HXR_UNKNOWN_IMAGE, "HXR_UNKNOWN_IMAGE" }, // 80040345
{ HXR_UNKNOWN_EFFECT, "HXR_UNKNOWN_EFFECT" }, // 80040345
{ HXR_SENDIMAGE_ABORTED, "HXR_SENDIMAGE_ABORTED" }, // 80040345
{ HXR_SENDEFFECT_ABORTED, "HXR_SENDEFFECT_ABORTED" }, // 80040345
{ HXR_SE_MIN_VALUE, "HXR_SE_MIN_VALUE" }, // 80041800
{ HXR_SE_NO_ERROR, "HXR_SE_NO_ERROR" }, // 80041901
{ HXR_SE_INVALID_VERSION, "HXR_SE_INVALID_VERSION" }, // 80041902
{ HXR_SE_INVALID_FORMAT, "HXR_SE_INVALID_FORMAT" }, // 80041903
{ HXR_SE_INVALID_BANDWIDTH, "HXR_SE_INVALID_BANDWIDTH" }, // 80041904
{ HXR_SE_INVALID_PATH, "HXR_SE_INVALID_PATH" }, // 80041905
{ HXR_SE_UNKNOWN_PATH, "HXR_SE_UNKNOWN_PATH" }, // 80041906
{ HXR_SE_INVALID_PROTOCOL, "HXR_SE_INVALID_PROTOCOL" }, // 80041907
{ HXR_SE_INVALID_PLAYER_ADDR, "HXR_SE_INVALID_PLAYER_ADDR" }, // 80041908
{ HXR_SE_LOCAL_STREAMS_PROHIBITED, "HXR_SE_LOCAL_STREAMS_PROHIBITED" }, // 80041909
{ HXR_SE_SERVER_FULL, "HXR_SE_SERVER_FULL" }, // 8004190a
{ HXR_SE_REMOTE_STREAMS_PROHIBITED, "HXR_SE_REMOTE_STREAMS_PROHIBITED" }, // 8004190b
{ HXR_SE_EVENT_STREAMS_PROHIBITED, "HXR_SE_EVENT_STREAMS_PROHIBITED" }, // 8004190c
{ HXR_SE_INVALID_HOST, "HXR_SE_INVALID_HOST" }, // 8004190d
{ HXR_SE_NO_CODEC, "HXR_SE_NO_CODEC" }, // 8004190e
{ HXR_SE_LIVEFILE_INVALID_BWN, "HXR_SE_LIVEFILE_INVALID_BWN" }, // 8004190f
{ HXR_SE_UNABLE_TO_FULFILL, "HXR_SE_UNABLE_TO_FULFILL" }, // 80041910
{ HXR_SE_MULTICAST_DELIVERY_ONLY, "HXR_SE_MULTICAST_DELIVERY_ONLY" }, // 80041911
{ HXR_SE_LICENSE_EXCEEDED, "HXR_SE_LICENSE_EXCEEDED" }, // 80041912
{ HXR_SE_LICENSE_UNAVAILABLE, "HXR_SE_LICENSE_UNAVAILABLE" }, // 80041913
{ HXR_SE_INVALID_LOSS_CORRECTION, "HXR_SE_INVALID_LOSS_CORRECTION" }, // 80041914
{ HXR_SE_PROTOCOL_FAILURE, "HXR_SE_PROTOCOL_FAILURE" }, // 80041915
{ HXR_SE_REALVIDEO_STREAMS_PROHIBITED, "HXR_SE_REALVIDEO_STREAMS_PROHIBITED" }, // 80041916
{ HXR_SE_REALAUDIO_STREAMS_PROHIBITED, "HXR_SE_REALAUDIO_STREAMS_PROHIBITED" }, // 80041917
{ HXR_SE_DATATYPE_UNSUPPORTED, "HXR_SE_DATATYPE_UNSUPPORTED" }, // 80041918
{ HXR_SE_DATATYPE_UNLICENSED, "HXR_SE_DATATYPE_UNLICENSED" }, // 80041919
{ HXR_SE_RESTRICTED_PLAYER, "HXR_SE_RESTRICTED_PLAYER" }, // 8004191a
{ HXR_SE_STREAM_INITIALIZING, "HXR_SE_STREAM_INITIALIZING" }, // 8004191b
{ HXR_SE_INVALID_PLAYER, "HXR_SE_INVALID_PLAYER" }, // 8004191c
{ HXR_SE_PLAYER_PLUS_ONLY, "HXR_SE_PLAYER_PLUS_ONLY" }, // 8004191d
{ HXR_SE_NO_EMBEDDED_PLAYERS, "HXR_SE_NO_EMBEDDED_PLAYERS" }, // 8004191e
{ HXR_SE_PNA_PROHIBITED, "HXR_SE_PNA_PROHIBITED" }, // 8004191f
{ HXR_SE_AUTHENTICATION_UNSUPPORTED, "HXR_SE_AUTHENTICATION_UNSUPPORTED" }, // 80041920
{ HXR_SE_MAX_FAILED_AUTHENTICATIONS, "HXR_SE_MAX_FAILED_AUTHENTICATIONS" }, // 80041921
{ HXR_SE_AUTH_ACCESS_DENIED, "HXR_SE_AUTH_ACCESS_DENIED" }, // 80041922
{ HXR_SE_AUTH_UUID_READ_ONLY, "HXR_SE_AUTH_UUID_READ_ONLY" }, // 80041923
{ HXR_SE_AUTH_UUID_NOT_UNIQUE, "HXR_SE_AUTH_UUID_NOT_UNIQUE" }, // 80041924
{ HXR_SE_AUTH_NO_SUCH_USER, "HXR_SE_AUTH_NO_SUCH_USER" }, // 80041925
{ HXR_SE_AUTH_REGISTRATION_SUCCEEDED, "HXR_SE_AUTH_REGISTRATION_SUCCEEDED" }, // 80041926
{ HXR_SE_AUTH_REGISTRATION_FAILED, "HXR_SE_AUTH_REGISTRATION_FAILED" }, // 80041927
{ HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED, "HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED" }, // 80041928
{ HXR_SE_AUTH_UNREGISTERED_PLAYER, "HXR_SE_AUTH_UNREGISTERED_PLAYER" }, // 80041929
{ HXR_SE_AUTH_TIME_EXPIRED, "HXR_SE_AUTH_TIME_EXPIRED" }, // 8004192a
{ HXR_SE_AUTH_NO_TIME_LEFT, "HXR_SE_AUTH_NO_TIME_LEFT" }, // 8004192b
{ HXR_SE_AUTH_ACCOUNT_LOCKED, "HXR_SE_AUTH_ACCOUNT_LOCKED" }, // 8004192c
{ HXR_SE_AUTH_INVALID_SERVER_CFG, "HXR_SE_AUTH_INVALID_SERVER_CFG" }, // 8004192d
{ HXR_SE_NO_MOBILE_DOWNLOAD, "HXR_SE_NO_MOBILE_DOWNLOAD" }, // 8004192e
{ HXR_SE_NO_MORE_MULTI_ADDR, "HXR_SE_NO_MORE_MULTI_ADDR" }, // 8004192f
{ HXR_PE_PROXY_MAX_CONNECTIONS, "HXR_PE_PROXY_MAX_CONNECTIONS" }, // 80041930
{ HXR_PE_PROXY_MAX_GW_BANDWIDTH, "HXR_PE_PROXY_MAX_GW_BANDWIDTH" }, // 80041931
{ HXR_PE_PROXY_MAX_BANDWIDTH, "HXR_PE_PROXY_MAX_BANDWIDTH" }, // 80041932
{ HXR_SE_BAD_LOADTEST_PASSWORD, "HXR_SE_BAD_LOADTEST_PASSWORD" }, // 80041933
{ HXR_SE_PNA_NOT_SUPPORTED, "HXR_SE_PNA_NOT_SUPPORTED" }, // 80041934
{ HXR_PE_PROXY_ORIGIN_DISCONNECTED, "HXR_PE_PROXY_ORIGIN_DISCONNECTED" }, // 80041935
{ HXR_SE_INTERNAL_ERROR, "HXR_SE_INTERNAL_ERROR" }, // 80041936
{ HXR_SE_MAX_VALUE, "HXR_SE_MAX_VALUE" }, // 80041937
{ 0, 0 }
};
const char*
HXErrorCodeToString( UINT32 ulHXCode )
{
int index;
for ( index = 0; HXCodeToKeyMap[ index ].ulHXCode != 0; ++index )
{
if ( HXCodeToKeyMap[index].ulHXCode == ulHXCode )
{
return HXCodeToKeyMap[ index ].pKeyString;
}
}
return NULL;
}
Index: Umakefil
===================================================================
RCS file: /cvsroot/common/util/Umakefil,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Umakefil 25 Jan 2005 17:58:45 -0000 1.40
+++ Umakefil 25 Feb 2005 22:58:20 -0000 1.41
@@ -80,7 +80,7 @@
"mimechk.cpp",
"miscsp.cpp",
"mmx_util.c",
- "cpuident.c",
+ "cpuident.c",
"nptime.cpp",
"ntptime.cpp",
"pathutil.cpp",
@@ -139,7 +139,8 @@
"hxabdutil.cpp",
"hxmovavg.cpp",
"hxmovmed.cpp",
- "bufnum.cpp")
+ "bufnum.cpp",
+ "hxerrorcodestrings.c")
project.AddSources("tconverter/fxpoint/tconverter_fxp.cpp")
From ping at helixcommunity.org Fri Feb 25 15:55:10 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Feb 25 15:55:12 2005
Subject: [Common-cvs] util Umakefil,1.41,1.42
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv9609
Modified Files:
Umakefil
Log Message:
file name is case-sensitive
Index: Umakefil
===================================================================
RCS file: /cvsroot/common/util/Umakefil,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Umakefil 25 Feb 2005 22:58:20 -0000 1.41
+++ Umakefil 25 Feb 2005 23:55:08 -0000 1.42
@@ -140,7 +140,7 @@
"hxmovavg.cpp",
"hxmovmed.cpp",
"bufnum.cpp",
- "hxerrorcodestrings.c")
+ "HXErrorCodeStrings.c")
project.AddSources("tconverter/fxpoint/tconverter_fxp.cpp")
From ping at helixcommunity.org Fri Feb 25 21:16:43 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Feb 25 21:16:45 2005
Subject: [Common-cvs] util/pub HXErrorCodeStrings.h,NONE,1.1.2.1
Message-ID:
Update of /cvsroot/common/util/pub
In directory cvs-new:/tmp/cvs-serv16202/pub
Added Files:
Tag: hxclient_1_3_0_neptunex
HXErrorCodeStrings.h
Log Message:
moved HXErrorCodeStrings from player/hxclientkit
--- NEW FILE: HXErrorCodeStrings.h ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: HXErrorCodeStrings.h,v 1.1.2.1 2005/02/26 05:16:41 ping Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef _HXERROR_CODE_STRINGS_H_
#define _HXERROR_CODE_STRINGS_H_
#ifdef __cplusplus
extern "C" {
#endif
const char* HXErrorCodeToString( UINT32 ulHXCode );
#ifdef __cplusplus
}
#endif
#endif
From ping at helixcommunity.org Fri Feb 25 21:16:43 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Feb 25 21:16:46 2005
Subject: [Common-cvs] util HXErrorCodeStrings.c, NONE, 1.1.2.1 Umakefil,
1.17.2.4, 1.17.2.5
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv16202
Modified Files:
Tag: hxclient_1_3_0_neptunex
Umakefil
Added Files:
Tag: hxclient_1_3_0_neptunex
HXErrorCodeStrings.c
Log Message:
moved HXErrorCodeStrings from player/hxclientkit
--- NEW FILE: HXErrorCodeStrings.c ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: HXErrorCodeStrings.c,v 1.1.2.1 2005/02/26 05:16:41 ping Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#include "hxtypes.h"
#include "hxresult.h"
#include "HXErrorCodeStrings.h"
typedef struct MapHXCodeToKeyRecord
{
UINT32 ulHXCode;
char* pKeyString;
} MapHXCodeToKeyRecord;
static MapHXCodeToKeyRecord const HXCodeToKeyMap[] =
{
{ HXR_NOTIMPL, "HXR_NOTIMPL" }, // 80004001
{ HXR_OUTOFMEMORY, "HXR_OUTOFMEMORY" }, // 8007000e
{ HXR_INVALID_PARAMETER, "HXR_INVALID_PARAMETER" }, // 80070057
{ HXR_NOINTERFACE, "HXR_NOINTERFACE" }, // 80004002
{ HXR_POINTER, "HXR_POINTER" }, // 80004003
{ HXR_HANDLE, "HXR_HANDLE" }, // 80070006
{ HXR_ABORT, "HXR_ABORT" }, // 80004004
{ HXR_FAIL, "HXR_FAIL" }, // 80004005
{ HXR_ACCESSDENIED, "HXR_ACCESSDENIED" }, // 80070005
{ HXR_IGNORE, "HXR_IGNORE" }, // 80000006
{ HXR_INVALID_OPERATION, "HXR_INVALID_OPERATION" }, // 80040004
{ HXR_INVALID_VERSION, "HXR_INVALID_VERSION" }, // 80040005
{ HXR_INVALID_REVISION, "HXR_INVALID_REVISION" }, // 80040006
{ HXR_NOT_INITIALIZED, "HXR_NOT_INITIALIZED" }, // 80040007
{ HXR_DOC_MISSING, "HXR_DOC_MISSING" }, // 80040008
{ HXR_UNEXPECTED, "HXR_UNEXPECTED" }, // 80040009
{ HXR_INCOMPLETE, "HXR_INCOMPLETE" }, // 8004000c
{ HXR_BUFFERTOOSMALL, "HXR_BUFFERTOOSMALL" }, // 8004000d
{ HXR_UNSUPPORTED_VIDEO, "HXR_UNSUPPORTED_VIDEO" }, // 8004000e
{ HXR_UNSUPPORTED_AUDIO, "HXR_UNSUPPORTED_AUDIO" }, // 8004000f
{ HXR_INVALID_BANDWIDTH, "HXR_INVALID_BANDWIDTH" }, // 80040010
{ HXR_NO_RENDERER, "HXR_NO_RENDERER" }, // 80040011
{ HXR_NO_FILEFORMAT, "HXR_NO_FILEFORMAT" }, // 80040011
{ HXR_MISSING_COMPONENTS, "HXR_MISSING_COMPONENTS" }, // 80040011
{ HXR_ELEMENT_NOT_FOUND, "HXR_ELEMENT_NOT_FOUND" }, // 00040012
{ HXR_NOCLASS, "HXR_NOCLASS" }, // 00040013
{ HXR_CLASS_NOAGGREGATION, "HXR_CLASS_NOAGGREGATION" }, // 00040014
{ HXR_NOT_LICENSED, "HXR_NOT_LICENSED" }, // 80040015
{ HXR_NO_FILESYSTEM, "HXR_NO_FILESYSTEM" }, // 80040016
{ HXR_REQUEST_UPGRADE, "HXR_REQUEST_UPGRADE" }, // 80040017
{ HXR_CHECK_RIGHTS, "HXR_CHECK_RIGHTS" }, // 80040018
{ HXR_RESTORE_SERVER_DENIED, "HXR_RESTORE_SERVER_DENIED" }, // 80040019
{ HXR_DEBUGGER_DETECTED, "HXR_DEBUGGER_DETECTED" }, // 8004001a
{ HXR_RESTORE_SERVER_CONNECT, "HXR_RESTORE_SERVER_CONNECT" }, // 8004005c
{ HXR_RESTORE_SERVER_TIMEOUT, "HXR_RESTORE_SERVER_TIMEOUT" }, // 8004005d
{ HXR_REVOKE_SERVER_CONNECT, "HXR_REVOKE_SERVER_CONNECT" }, // 8004005e
{ HXR_REVOKE_SERVER_TIMEOUT, "HXR_REVOKE_SERVER_TIMEOUT" }, // 8004005f
{ HXR_VIEW_RIGHTS_NODRM, "HXR_VIEW_RIGHTS_NODRM" }, // 800401cd
{ HXR_VSRC_NODRM, "HXR_VSRC_NODRM" }, // 800401d3
{ HXR_AWAITING_LICENSE, "HXR_AWAITING_LICENSE" }, // 8004001f
{ HXR_ALREADY_INITIALIZED, "HXR_ALREADY_INITIALIZED" }, // 80040020
{ HXR_NOT_SUPPORTED, "HXR_NOT_SUPPORTED" }, // 80040021
{ HXR_S_FALSE, "HXR_S_FALSE" }, // 00040022
{ PNR_WARNING, "PNR_WARNING" }, // 00040023
{ HXR_BUFFERING, "HXR_BUFFERING" }, // 00040040
{ HXR_PAUSED, "HXR_PAUSED" }, // 00040041
{ HXR_NO_DATA, "HXR_NO_DATA" }, // 00040042
{ HXR_STREAM_DONE, "HXR_STREAM_DONE" }, // 00040043
{ HXR_NET_SOCKET_INVALID, "HXR_NET_SOCKET_INVALID" }, // 80040043
{ HXR_NET_CONNECT, "HXR_NET_CONNECT" }, // 80040044
{ HXR_BIND, "HXR_BIND" }, // 80040045
{ HXR_SOCKET_CREATE, "HXR_SOCKET_CREATE" }, // 80040046
{ HXR_INVALID_HOST, "HXR_INVALID_HOST" }, // 80040047
{ HXR_NET_READ, "HXR_NET_READ" }, // 80040048
{ HXR_NET_WRITE, "HXR_NET_WRITE" }, // 80040049
{ HXR_NET_UDP, "HXR_NET_UDP" }, // 8004004a
{ HXR_RETRY, "HXR_RETRY" }, // 8004004b
{ HXR_SERVER_TIMEOUT, "HXR_SERVER_TIMEOUT" }, // 8004004c
{ HXR_SERVER_DISCONNECTED, "HXR_SERVER_DISCONNECTED" }, // 8004004d
{ HXR_WOULD_BLOCK, "HXR_WOULD_BLOCK" }, // 8004004e
{ HXR_GENERAL_NONET, "HXR_GENERAL_NONET" }, // 8004004f
{ HXR_BLOCK_CANCELED, "HXR_BLOCK_CANCELED" }, // 80040050
{ HXR_MULTICAST_JOIN, "HXR_MULTICAST_JOIN" }, // 80040051
{ HXR_GENERAL_MULTICAST, "HXR_GENERAL_MULTICAST" }, // 80040052
{ HXR_MULTICAST_UDP, "HXR_MULTICAST_UDP" }, // 80040053
{ HXR_AT_INTERRUPT, "HXR_AT_INTERRUPT" }, // 80040054
{ HXR_MSG_TOOLARGE, "HXR_MSG_TOOLARGE" }, // 80040055
{ HXR_NET_TCP, "HXR_NET_TCP" }, // 80040056
{ HXR_TRY_AUTOCONFIG, "HXR_TRY_AUTOCONFIG" }, // 80040057
{ HXR_NOTENOUGH_BANDWIDTH, "HXR_NOTENOUGH_BANDWIDTH" }, // 80040058
{ HXR_HTTP_CONNECT, "HXR_HTTP_CONNECT" }, // 80040059
{ HXR_PORT_IN_USE, "HXR_PORT_IN_USE" }, // 8004005a
{ HXR_LOADTEST_NOT_SUPPORTED, "HXR_LOADTEST_NOT_SUPPORTED" }, // 8004005b
{ HXR_TCP_CONNECT, "HXR_TCP_CONNECT" }, // 00040060
{ HXR_TCP_RECONNECT, "HXR_TCP_RECONNECT" }, // 00040061
{ HXR_TCP_FAILED, "HXR_TCP_FAILED" }, // 80040062
{ HXR_AUTH_SOCKET_CREATE_FAILURE, "HXR_AUTH_SOCKET_CREATE_FAILURE" }, // 80040063
{ HXR_AUTH_TCP_CONNECT_FAILURE, "HXR_AUTH_TCP_CONNECT_FAILURE" }, // 80040064
{ HXR_AUTH_TCP_CONNECT_TIMEOUT, "HXR_AUTH_TCP_CONNECT_TIMEOUT" }, // 80040065
{ HXR_AUTH_FAILURE, "HXR_AUTH_FAILURE" }, // 80040066
{ HXR_AUTH_REQ_PARAMETER_MISSING, "HXR_AUTH_REQ_PARAMETER_MISSING" }, // 80040067
{ HXR_DNS_RESOLVE_FAILURE, "HXR_DNS_RESOLVE_FAILURE" }, // 80040068
{ HXR_AUTH_SUCCEEDED, "HXR_AUTH_SUCCEEDED" }, // 00040068
{ HXR_PULL_AUTHENTICATION_FAILED, "HXR_PULL_AUTHENTICATION_FAILED" }, // 80040069
{ HXR_BIND_ERROR, "HXR_BIND_ERROR" }, // 8004006a
{ HXR_PULL_PING_TIMEOUT, "HXR_PULL_PING_TIMEOUT" }, // 8004006b
{ HXR_AUTH_TCP_FAILED, "HXR_AUTH_TCP_FAILED" }, // 8004006c
{ HXR_UNEXPECTED_STREAM_END, "HXR_UNEXPECTED_STREAM_END" }, // 8004006d
{ HXR_AUTH_READ_TIMEOUT, "HXR_AUTH_READ_TIMEOUT" }, // 8004006e
{ HXR_AUTH_CONNECTION_FAILURE, "HXR_AUTH_CONNECTION_FAILURE" }, // 8004006f
{ HXR_BLOCKED, "HXR_BLOCKED" }, // 80040070
{ HXR_NOTENOUGH_PREDECBUF, "HXR_NOTENOUGH_PREDECBUF" }, // 80040071
{ HXR_AT_END, "HXR_AT_END" }, // 00040080
{ HXR_INVALID_FILE, "HXR_INVALID_FILE" }, // 80040081
{ HXR_INVALID_PATH, "HXR_INVALID_PATH" }, // 80040082
{ HXR_RECORD, "HXR_RECORD" }, // 80040083
{ HXR_RECORD_WRITE, "HXR_RECORD_WRITE" }, // 80040084
{ HXR_TEMP_FILE, "HXR_TEMP_FILE" }, // 80040085
{ HXR_ALREADY_OPEN, "HXR_ALREADY_OPEN" }, // 80040086
{ HXR_SEEK_PENDING, "HXR_SEEK_PENDING" }, // 80040087
{ HXR_CANCELLED, "HXR_CANCELLED" }, // 80040088
{ HXR_FILE_NOT_FOUND, "HXR_FILE_NOT_FOUND" }, // 80040089
{ HXR_WRITE_ERROR, "HXR_WRITE_ERROR" }, // 8004008a
{ HXR_FILE_EXISTS, "HXR_FILE_EXISTS" }, // 8004008b
{ HXR_FILE_NOT_OPEN, "HXR_FILE_NOT_OPEN" }, // 8004008c
{ HXR_ADVISE_PREFER_LINEAR, "HXR_ADVISE_PREFER_LINEAR" }, // 0004008d
{ HXR_PARSE_ERROR, "HXR_PARSE_ERROR" }, // 8004008e
{ HXR_ADVISE_NOASYNC_SEEK, "HXR_ADVISE_NOASYNC_SEEK" }, // 0004008f
{ HXR_HEADER_PARSE_ERROR, "HXR_HEADER_PARSE_ERROR" }, // 80040090
{ HXR_CORRUPT_FILE , "HXR_CORRUPT_FILE " }, // 80040091
{ HXR_BAD_SERVER, "HXR_BAD_SERVER" }, // 800400c0
{ HXR_ADVANCED_SERVER, "HXR_ADVANCED_SERVER" }, // 800400c1
{ HXR_OLD_SERVER, "HXR_OLD_SERVER" }, // 800400c2
{ HXR_REDIRECTION, "HXR_REDIRECTION" }, // 000400c3
{ HXR_SERVER_ALERT, "HXR_SERVER_ALERT" }, // 800400c4
{ HXR_PROXY, "HXR_PROXY" }, // 800400c5
{ HXR_PROXY_RESPONSE, "HXR_PROXY_RESPONSE" }, // 800400c6
{ HXR_ADVANCED_PROXY, "HXR_ADVANCED_PROXY" }, // 800400c7
{ HXR_OLD_PROXY, "HXR_OLD_PROXY" }, // 800400c8
{ HXR_INVALID_PROTOCOL, "HXR_INVALID_PROTOCOL" }, // 800400c9
{ HXR_INVALID_URL_OPTION, "HXR_INVALID_URL_OPTION" }, // 800400ca
{ HXR_INVALID_URL_HOST, "HXR_INVALID_URL_HOST" }, // 800400cb
{ HXR_INVALID_URL_PATH, "HXR_INVALID_URL_PATH" }, // 800400cc
{ HXR_HTTP_CONTENT_NOT_FOUND, "HXR_HTTP_CONTENT_NOT_FOUND" }, // 800400cd
{ HXR_NOT_AUTHORIZED, "HXR_NOT_AUTHORIZED" }, // 800400ce
{ HXR_UNEXPECTED_MSG, "HXR_UNEXPECTED_MSG" }, // 800400cf
{ HXR_BAD_TRANSPORT, "HXR_BAD_TRANSPORT" }, // 800400d0
{ HXR_NO_SESSION_ID, "HXR_NO_SESSION_ID" }, // 800400d1
{ HXR_PROXY_DNR, "HXR_PROXY_DNR" }, // 800400d2
{ HXR_PROXY_NET_CONNECT, "HXR_PROXY_NET_CONNECT" }, // 800400d3
{ HXR_AGGREGATE_OP_NOT_ALLOWED, "HXR_AGGREGATE_OP_NOT_ALLOWED" }, // 800400d4
{ HXR_RIGHTS_EXPIRED, "HXR_RIGHTS_EXPIRED" }, // 800400d5
{ HXR_NOT_MODIFIED, "HXR_NOT_MODIFIED" }, // 800400d6
{ HXR_FORBIDDEN, "HXR_FORBIDDEN" }, // 800400d7
{ HXR_AUDIO_DRIVER, "HXR_AUDIO_DRIVER" }, // 80040100
{ HXR_LATE_PACKET, "HXR_LATE_PACKET" }, // 80040101
{ HXR_OVERLAPPED_PACKET, "HXR_OVERLAPPED_PACKET" }, // 80040102
{ HXR_OUTOFORDER_PACKET, "HXR_OUTOFORDER_PACKET" }, // 80040103
{ HXR_NONCONTIGUOUS_PACKET, "HXR_NONCONTIGUOUS_PACKET" }, // 80040104
{ HXR_OPEN_NOT_PROCESSED, "HXR_OPEN_NOT_PROCESSED" }, // 80040140
{ HXR_WINDRAW_EXCEPTION, "HXR_WINDRAW_EXCEPTION" }, // 80040141
{ HXR_EXPIRED, "HXR_EXPIRED" }, // 80040180
{ HXR_INVALID_INTERLEAVER, "HXR_INVALID_INTERLEAVER" }, // 80040fc0
{ HXR_BAD_FORMAT, "HXR_BAD_FORMAT" }, // 80040fc1
{ HXR_CHUNK_MISSING, "HXR_CHUNK_MISSING" }, // 80040fc2
{ HXR_INVALID_STREAM, "HXR_INVALID_STREAM" }, // 80040fc3
{ HXR_DNR, "HXR_DNR" }, // 80040fc4
{ HXR_OPEN_DRIVER, "HXR_OPEN_DRIVER" }, // 80040fc5
{ HXR_UPGRADE, "HXR_UPGRADE" }, // 80040fc6
{ HXR_NOTIFICATION, "HXR_NOTIFICATION" }, // 80040fc7
{ HXR_NOT_NOTIFIED, "HXR_NOT_NOTIFIED" }, // 80040fc8
{ HXR_STOPPED, "HXR_STOPPED" }, // 80040fc9
{ HXR_CLOSED, "HXR_CLOSED" }, // 80040fca
{ HXR_INVALID_WAV_FILE, "HXR_INVALID_WAV_FILE" }, // 80040fcb
{ HXR_NO_SEEK, "HXR_NO_SEEK" }, // 80040fcc
{ HXR_DEC_INITED, "HXR_DEC_INITED" }, // 80040200
{ HXR_DEC_NOT_FOUND, "HXR_DEC_NOT_FOUND" }, // 80040201
{ HXR_DEC_INVALID, "HXR_DEC_INVALID" }, // 80040202
{ HXR_DEC_TYPE_MISMATCH, "HXR_DEC_TYPE_MISMATCH" }, // 80040203
{ HXR_DEC_INIT_FAILED, "HXR_DEC_INIT_FAILED" }, // 80040204
{ HXR_DEC_NOT_INITED, "HXR_DEC_NOT_INITED" }, // 80040205
{ HXR_DEC_DECOMPRESS, "HXR_DEC_DECOMPRESS" }, // 80040206
{ HXR_OBSOLETE_VERSION, "HXR_OBSOLETE_VERSION" }, // 80040207
{ HXR_ENC_FILE_TOO_SMALL, "HXR_ENC_FILE_TOO_SMALL" }, // 80040240
{ HXR_ENC_UNKNOWN_FILE, "HXR_ENC_UNKNOWN_FILE" }, // 80040241
{ HXR_ENC_BAD_CHANNELS, "HXR_ENC_BAD_CHANNELS" }, // 80040242
{ HXR_ENC_BAD_SAMPSIZE, "HXR_ENC_BAD_SAMPSIZE" }, // 80040243
{ HXR_ENC_BAD_SAMPRATE, "HXR_ENC_BAD_SAMPRATE" }, // 80040244
{ HXR_ENC_INVALID, "HXR_ENC_INVALID" }, // 80040245
{ HXR_ENC_NO_OUTPUT_FILE, "HXR_ENC_NO_OUTPUT_FILE" }, // 80040246
{ HXR_ENC_NO_INPUT_FILE, "HXR_ENC_NO_INPUT_FILE" }, // 80040247
{ HXR_ENC_NO_OUTPUT_PERMISSIONS, "HXR_ENC_NO_OUTPUT_PERMISSIONS" }, // 80040248
{ HXR_ENC_BAD_FILETYPE, "HXR_ENC_BAD_FILETYPE" }, // 80040249
{ HXR_ENC_INVALID_VIDEO, "HXR_ENC_INVALID_VIDEO" }, // 8004024a
{ HXR_ENC_INVALID_AUDIO, "HXR_ENC_INVALID_AUDIO" }, // 8004024b
{ HXR_ENC_NO_VIDEO_CAPTURE, "HXR_ENC_NO_VIDEO_CAPTURE" }, // 8004024c
{ HXR_ENC_INVALID_VIDEO_CAPTURE, "HXR_ENC_INVALID_VIDEO_CAPTURE" }, // 8004024d
{ HXR_ENC_NO_AUDIO_CAPTURE, "HXR_ENC_NO_AUDIO_CAPTURE" }, // 8004024e
{ HXR_ENC_INVALID_AUDIO_CAPTURE, "HXR_ENC_INVALID_AUDIO_CAPTURE" }, // 8004024f
{ HXR_ENC_TOO_SLOW_FOR_LIVE, "HXR_ENC_TOO_SLOW_FOR_LIVE" }, // 80040250
{ HXR_ENC_ENGINE_NOT_INITIALIZED, "HXR_ENC_ENGINE_NOT_INITIALIZED" }, // 80040251
{ HXR_ENC_CODEC_NOT_FOUND, "HXR_ENC_CODEC_NOT_FOUND" }, // 80040252
{ HXR_ENC_CODEC_NOT_INITIALIZED, "HXR_ENC_CODEC_NOT_INITIALIZED" }, // 80040253
{ HXR_ENC_INVALID_INPUT_DIMENSIONS, "HXR_ENC_INVALID_INPUT_DIMENSIONS" }, // 80040254
{ HXR_ENC_MESSAGE_IGNORED, "HXR_ENC_MESSAGE_IGNORED" }, // 80040255
{ HXR_ENC_NO_SETTINGS, "HXR_ENC_NO_SETTINGS" }, // 80040256
{ HXR_ENC_NO_OUTPUT_TYPES, "HXR_ENC_NO_OUTPUT_TYPES" }, // 80040257
{ HXR_ENC_IMPROPER_STATE, "HXR_ENC_IMPROPER_STATE" }, // 80040258
{ HXR_ENC_INVALID_SERVER, "HXR_ENC_INVALID_SERVER" }, // 80040259
{ HXR_ENC_INVALID_TEMP_PATH, "HXR_ENC_INVALID_TEMP_PATH" }, // 8004025a
{ HXR_ENC_MERGE_FAIL, "HXR_ENC_MERGE_FAIL" }, // 8004025b
{ HXR_BIN_DATA_NOT_FOUND, "HXR_BIN_DATA_NOT_FOUND" }, // 0004025c
{ HXR_BIN_END_OF_DATA, "HXR_BIN_END_OF_DATA" }, // 0004025d
{ HXR_BIN_DATA_PURGED, "HXR_BIN_DATA_PURGED" }, // 8004025e
{ HXR_BIN_FULL, "HXR_BIN_FULL" }, // 8004025f
{ HXR_BIN_OFFSET_PAST_END, "HXR_BIN_OFFSET_PAST_END" }, // 80040260
{ HXR_ENC_NO_ENCODED_DATA, "HXR_ENC_NO_ENCODED_DATA" }, // 80040261
{ HXR_ENC_INVALID_DLL, "HXR_ENC_INVALID_DLL" }, // 80040262
{ HXR_NOT_INDEXABLE, "HXR_NOT_INDEXABLE" }, // 80040263
{ HXR_ENC_NO_BROWSER, "HXR_ENC_NO_BROWSER" }, // 80040264
{ HXR_ENC_NO_FILE_TO_SERVER, "HXR_ENC_NO_FILE_TO_SERVER" }, // 80040265
{ HXR_ENC_INSUFFICIENT_DISK_SPACE, "HXR_ENC_INSUFFICIENT_DISK_SPACE" }, // 80040266
{ HXR_ENC_SAMPLE_DISCARDED, "HXR_ENC_SAMPLE_DISCARDED" }, // 00040267
{ HXR_ENC_RV10_FRAME_TOO_LARGE, "HXR_ENC_RV10_FRAME_TOO_LARGE" }, // 80040268
{ HXR_S_NOT_HANDLED, "HXR_S_NOT_HANDLED" }, // 00040269
{ HXR_S_END_OF_STREAM, "HXR_S_END_OF_STREAM" }, // 0004026a
{ HXR_S_JOBFILE_INCOMPLETE, "HXR_S_JOBFILE_INCOMPLETE" }, //
{ HXR_S_NOTHING_TO_SERIALIZE, "HXR_S_NOTHING_TO_SERIALIZE" }, //
{ HXR_SIZENOTSET, "HXR_SIZENOTSET" }, //
{ HXR_ALREADY_COMMITTED, "HXR_ALREADY_COMMITTED" }, //
{ HXR_BUFFERS_OUTSTANDING, "HXR_BUFFERS_OUTSTANDING" }, //
{ HXR_NOT_COMMITTED, "HXR_NOT_COMMITTED" }, //
{ HXR_SAMPLE_TIME_NOT_SET, "HXR_SAMPLE_TIME_NOT_SET" }, //
{ HXR_TIMEOUT, "HXR_TIMEOUT" }, //
{ HXR_WRONGSTATE, "HXR_WRONGSTATE" }, //
{ HXR_RMT_USAGE_ERROR, "HXR_RMT_USAGE_ERROR" }, // 800403c1
{ HXR_RMT_INVALID_ENDTIME, "HXR_RMT_INVALID_ENDTIME" }, // 800403c2
{ HXR_RMT_MISSING_INPUT_FILE, "HXR_RMT_MISSING_INPUT_FILE" }, // 800403c3
{ HXR_RMT_MISSING_OUTPUT_FILE, "HXR_RMT_MISSING_OUTPUT_FILE" }, // 800403c4
{ HXR_RMT_INPUT_EQUALS_OUTPUT_FILE, "HXR_RMT_INPUT_EQUALS_OUTPUT_FILE" }, // 800403c5
{ HXR_RMT_UNSUPPORTED_AUDIO_VERSION, "HXR_RMT_UNSUPPORTED_AUDIO_VERSION" }, // 800403c6
{ HXR_RMT_DIFFERENT_AUDIO, "HXR_RMT_DIFFERENT_AUDIO" }, // 800403c7
{ HXR_RMT_DIFFERENT_VIDEO, "HXR_RMT_DIFFERENT_VIDEO" }, // 800403c8
{ HXR_RMT_PASTE_MISSING_STREAM, "HXR_RMT_PASTE_MISSING_STREAM" }, // 800403c9
{ HXR_RMT_END_OF_STREAM, "HXR_RMT_END_OF_STREAM" }, // 800403ca
{ HXR_RMT_IMAGE_MAP_PARSE_ERROR, "HXR_RMT_IMAGE_MAP_PARSE_ERROR" }, // 800403cb
{ HXR_RMT_INVALID_IMAGEMAP_FILE, "HXR_RMT_INVALID_IMAGEMAP_FILE" }, // 800403cc
{ HXR_RMT_EVENT_PARSE_ERROR, "HXR_RMT_EVENT_PARSE_ERROR" }, // 800403cd
{ HXR_RMT_INVALID_EVENT_FILE, "HXR_RMT_INVALID_EVENT_FILE" }, // 800403ce
{ HXR_RMT_INVALID_OUTPUT_FILE, "HXR_RMT_INVALID_OUTPUT_FILE" }, // 800403cf
{ HXR_RMT_INVALID_DURATION, "HXR_RMT_INVALID_DURATION" }, // 800403d0
{ HXR_RMT_NO_DUMP_FILES, "HXR_RMT_NO_DUMP_FILES" }, // 800403d1
{ HXR_RMT_NO_EVENT_DUMP_FILE, "HXR_RMT_NO_EVENT_DUMP_FILE" }, // 800403d2
{ HXR_RMT_NO_IMAP_DUMP_FILE, "HXR_RMT_NO_IMAP_DUMP_FILE" }, // 800403d3
{ HXR_RMT_NO_DATA, "HXR_RMT_NO_DATA" }, // 800403d4
{ HXR_RMT_EMPTY_STREAM, "HXR_RMT_EMPTY_STREAM" }, // 800403d5
{ HXR_RMT_READ_ONLY_FILE, "HXR_RMT_READ_ONLY_FILE" }, // 800403d6
{ HXR_RMT_PASTE_MISSING_AUDIO_STREAM, "HXR_RMT_PASTE_MISSING_AUDIO_STREAM" }, // 800403d7
{ HXR_RMT_PASTE_MISSING_VIDEO_STREAM, "HXR_RMT_PASTE_MISSING_VIDEO_STREAM" }, // 800403d8
{ HXR_RMT_ENCRYPTED_CONTENT, "HXR_RMT_ENCRYPTED_CONTENT" }, // 800403d9
{ HXR_PROP_NOT_FOUND, "HXR_PROP_NOT_FOUND" }, // 80040281
{ HXR_PROP_NOT_COMPOSITE, "HXR_PROP_NOT_COMPOSITE" }, // 80040282
{ HXR_PROP_DUPLICATE, "HXR_PROP_DUPLICATE" }, // 80040283
{ HXR_PROP_TYPE_MISMATCH, "HXR_PROP_TYPE_MISMATCH" }, // 80040284
{ HXR_PROP_ACTIVE, "HXR_PROP_ACTIVE" }, // 80040285
{ HXR_PROP_INACTIVE, "HXR_PROP_INACTIVE" }, // 80040286
{ HXR_PROP_VAL_UNDERFLOW, "HXR_PROP_VAL_UNDERFLOW" }, // 80040287
{ HXR_PROP_VAL_OVERFLOW, "HXR_PROP_VAL_OVERFLOW" }, // 80040288
{ HXR_PROP_VAL_LT_LBOUND, "HXR_PROP_VAL_LT_LBOUND" }, // 80040289
{ HXR_PROP_VAL_GT_UBOUND, "HXR_PROP_VAL_GT_UBOUND" }, // 8004028a
{ HXR_PROP_DELETE_PENDING, "HXR_PROP_DELETE_PENDING" }, // 0004028b
{ HXR_COULDNOTINITCORE, "HXR_COULDNOTINITCORE" }, // 800401c1
{ HXR_PERFECTPLAY_NOT_SUPPORTED, "HXR_PERFECTPLAY_NOT_SUPPORTED" }, // 800401c2
{ HXR_NO_LIVE_PERFECTPLAY, "HXR_NO_LIVE_PERFECTPLAY" }, // 800401c3
{ HXR_PERFECTPLAY_NOT_ALLOWED, "HXR_PERFECTPLAY_NOT_ALLOWED" }, // 800401c4
{ HXR_NO_CODECS, "HXR_NO_CODECS" }, // 800401c5
{ HXR_SLOW_MACHINE, "HXR_SLOW_MACHINE" }, // 800401c6
{ HXR_FORCE_PERFECTPLAY, "HXR_FORCE_PERFECTPLAY" }, // 800401c7
{ HXR_INVALID_HTTP_PROXY_HOST, "HXR_INVALID_HTTP_PROXY_HOST" }, // 800401c8
{ HXR_INVALID_METAFILE, "HXR_INVALID_METAFILE" }, // 800401c9
{ HXR_BROWSER_LAUNCH, "HXR_BROWSER_LAUNCH" }, // 800401ca
{ HXR_VIEW_SOURCE_NOCLIP, "HXR_VIEW_SOURCE_NOCLIP" }, // 800401cb
{ HXR_VIEW_SOURCE_DISSABLED, "HXR_VIEW_SOURCE_DISSABLED" }, // 800401cc
{ HXR_TIMELINE_SUSPENDED, "HXR_TIMELINE_SUSPENDED" }, // 800401ce
{ HXR_BUFFER_NOT_AVAILABLE, "HXR_BUFFER_NOT_AVAILABLE" }, // 800401cf
{ HXR_COULD_NOT_DISPLAY, "HXR_COULD_NOT_DISPLAY" }, // 800401d0
{ HXR_VSRC_DISABLED, "HXR_VSRC_DISABLED" }, // 800401d1
{ HXR_VSRC_NOCLIP, "HXR_VSRC_NOCLIP" }, // 800401d2
{ HXR_RESOURCE_NOT_CACHED, "HXR_RESOURCE_NOT_CACHED" }, // 80040301
{ HXR_RESOURCE_NOT_FOUND, "HXR_RESOURCE_NOT_FOUND" }, // 80040302
{ HXR_RESOURCE_CLOSE_FILE_FIRST, "HXR_RESOURCE_CLOSE_FILE_FIRST" }, // 80040303
{ HXR_RESOURCE_NODATA, "HXR_RESOURCE_NODATA" }, // 80040304
{ HXR_RESOURCE_BADFILE, "HXR_RESOURCE_BADFILE" }, // 80040305
{ HXR_RESOURCE_PARTIALCOPY, "HXR_RESOURCE_PARTIALCOPY" }, // 80040306
{ HXR_PPV_NO_USER, "HXR_PPV_NO_USER" }, // 800402c0
{ HXR_PPV_GUID_READ_ONLY, "HXR_PPV_GUID_READ_ONLY" }, // 800402c1
{ HXR_PPV_GUID_COLLISION, "HXR_PPV_GUID_COLLISION" }, // 800402c2
{ HXR_REGISTER_GUID_EXISTS, "HXR_REGISTER_GUID_EXISTS" }, // 800402c3
{ HXR_PPV_AUTHORIZATION_FAILED, "HXR_PPV_AUTHORIZATION_FAILED" }, // 800402c4
{ HXR_PPV_OLD_PLAYER, "HXR_PPV_OLD_PLAYER" }, // 800402c5
{ HXR_PPV_ACCOUNT_LOCKED, "HXR_PPV_ACCOUNT_LOCKED" }, // 800402c6
{ HXR_PPV_DBACCESS_ERROR, "HXR_PPV_DBACCESS_ERROR" }, // 800402c8
{ HXR_PPV_USER_ALREADY_EXISTS, "HXR_PPV_USER_ALREADY_EXISTS" }, // 800402c9
{ HXR_UPG_AUTH_FAILED, "HXR_UPG_AUTH_FAILED" }, // 80040340
{ HXR_UPG_CERT_AUTH_FAILED, "HXR_UPG_CERT_AUTH_FAILED" }, // 80040341
{ HXR_UPG_CERT_EXPIRED, "HXR_UPG_CERT_EXPIRED" }, // 80040342
{ HXR_UPG_CERT_REVOKED, "HXR_UPG_CERT_REVOKED" }, // 80040343
{ HXR_UPG_RUP_BAD, "HXR_UPG_RUP_BAD" }, // 80040344
{ HXR_UPG_SYSTEM_BUSY, "HXR_UPG_SYSTEM_BUSY" }, // 80040345
{ HXR_AUTOCFG_SUCCESS, "HXR_AUTOCFG_SUCCESS" }, // 80040345
{ HXR_AUTOCFG_FAILED, "HXR_AUTOCFG_FAILED" }, // 80040345
{ HXR_AUTOCFG_ABORT, "HXR_AUTOCFG_ABORT" }, // 80040345
{ HXR_UNKNOWN_IMAGE, "HXR_UNKNOWN_IMAGE" }, // 80040345
{ HXR_UNKNOWN_EFFECT, "HXR_UNKNOWN_EFFECT" }, // 80040345
{ HXR_SENDIMAGE_ABORTED, "HXR_SENDIMAGE_ABORTED" }, // 80040345
{ HXR_SENDEFFECT_ABORTED, "HXR_SENDEFFECT_ABORTED" }, // 80040345
{ HXR_SE_MIN_VALUE, "HXR_SE_MIN_VALUE" }, // 80041800
{ HXR_SE_NO_ERROR, "HXR_SE_NO_ERROR" }, // 80041901
{ HXR_SE_INVALID_VERSION, "HXR_SE_INVALID_VERSION" }, // 80041902
{ HXR_SE_INVALID_FORMAT, "HXR_SE_INVALID_FORMAT" }, // 80041903
{ HXR_SE_INVALID_BANDWIDTH, "HXR_SE_INVALID_BANDWIDTH" }, // 80041904
{ HXR_SE_INVALID_PATH, "HXR_SE_INVALID_PATH" }, // 80041905
{ HXR_SE_UNKNOWN_PATH, "HXR_SE_UNKNOWN_PATH" }, // 80041906
{ HXR_SE_INVALID_PROTOCOL, "HXR_SE_INVALID_PROTOCOL" }, // 80041907
{ HXR_SE_INVALID_PLAYER_ADDR, "HXR_SE_INVALID_PLAYER_ADDR" }, // 80041908
{ HXR_SE_LOCAL_STREAMS_PROHIBITED, "HXR_SE_LOCAL_STREAMS_PROHIBITED" }, // 80041909
{ HXR_SE_SERVER_FULL, "HXR_SE_SERVER_FULL" }, // 8004190a
{ HXR_SE_REMOTE_STREAMS_PROHIBITED, "HXR_SE_REMOTE_STREAMS_PROHIBITED" }, // 8004190b
{ HXR_SE_EVENT_STREAMS_PROHIBITED, "HXR_SE_EVENT_STREAMS_PROHIBITED" }, // 8004190c
{ HXR_SE_INVALID_HOST, "HXR_SE_INVALID_HOST" }, // 8004190d
{ HXR_SE_NO_CODEC, "HXR_SE_NO_CODEC" }, // 8004190e
{ HXR_SE_LIVEFILE_INVALID_BWN, "HXR_SE_LIVEFILE_INVALID_BWN" }, // 8004190f
{ HXR_SE_UNABLE_TO_FULFILL, "HXR_SE_UNABLE_TO_FULFILL" }, // 80041910
{ HXR_SE_MULTICAST_DELIVERY_ONLY, "HXR_SE_MULTICAST_DELIVERY_ONLY" }, // 80041911
{ HXR_SE_LICENSE_EXCEEDED, "HXR_SE_LICENSE_EXCEEDED" }, // 80041912
{ HXR_SE_LICENSE_UNAVAILABLE, "HXR_SE_LICENSE_UNAVAILABLE" }, // 80041913
{ HXR_SE_INVALID_LOSS_CORRECTION, "HXR_SE_INVALID_LOSS_CORRECTION" }, // 80041914
{ HXR_SE_PROTOCOL_FAILURE, "HXR_SE_PROTOCOL_FAILURE" }, // 80041915
{ HXR_SE_REALVIDEO_STREAMS_PROHIBITED, "HXR_SE_REALVIDEO_STREAMS_PROHIBITED" }, // 80041916
{ HXR_SE_REALAUDIO_STREAMS_PROHIBITED, "HXR_SE_REALAUDIO_STREAMS_PROHIBITED" }, // 80041917
{ HXR_SE_DATATYPE_UNSUPPORTED, "HXR_SE_DATATYPE_UNSUPPORTED" }, // 80041918
{ HXR_SE_DATATYPE_UNLICENSED, "HXR_SE_DATATYPE_UNLICENSED" }, // 80041919
{ HXR_SE_RESTRICTED_PLAYER, "HXR_SE_RESTRICTED_PLAYER" }, // 8004191a
{ HXR_SE_STREAM_INITIALIZING, "HXR_SE_STREAM_INITIALIZING" }, // 8004191b
{ HXR_SE_INVALID_PLAYER, "HXR_SE_INVALID_PLAYER" }, // 8004191c
{ HXR_SE_PLAYER_PLUS_ONLY, "HXR_SE_PLAYER_PLUS_ONLY" }, // 8004191d
{ HXR_SE_NO_EMBEDDED_PLAYERS, "HXR_SE_NO_EMBEDDED_PLAYERS" }, // 8004191e
{ HXR_SE_PNA_PROHIBITED, "HXR_SE_PNA_PROHIBITED" }, // 8004191f
{ HXR_SE_AUTHENTICATION_UNSUPPORTED, "HXR_SE_AUTHENTICATION_UNSUPPORTED" }, // 80041920
{ HXR_SE_MAX_FAILED_AUTHENTICATIONS, "HXR_SE_MAX_FAILED_AUTHENTICATIONS" }, // 80041921
{ HXR_SE_AUTH_ACCESS_DENIED, "HXR_SE_AUTH_ACCESS_DENIED" }, // 80041922
{ HXR_SE_AUTH_UUID_READ_ONLY, "HXR_SE_AUTH_UUID_READ_ONLY" }, // 80041923
{ HXR_SE_AUTH_UUID_NOT_UNIQUE, "HXR_SE_AUTH_UUID_NOT_UNIQUE" }, // 80041924
{ HXR_SE_AUTH_NO_SUCH_USER, "HXR_SE_AUTH_NO_SUCH_USER" }, // 80041925
{ HXR_SE_AUTH_REGISTRATION_SUCCEEDED, "HXR_SE_AUTH_REGISTRATION_SUCCEEDED" }, // 80041926
{ HXR_SE_AUTH_REGISTRATION_FAILED, "HXR_SE_AUTH_REGISTRATION_FAILED" }, // 80041927
{ HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED, "HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED" }, // 80041928
{ HXR_SE_AUTH_UNREGISTERED_PLAYER, "HXR_SE_AUTH_UNREGISTERED_PLAYER" }, // 80041929
{ HXR_SE_AUTH_TIME_EXPIRED, "HXR_SE_AUTH_TIME_EXPIRED" }, // 8004192a
{ HXR_SE_AUTH_NO_TIME_LEFT, "HXR_SE_AUTH_NO_TIME_LEFT" }, // 8004192b
{ HXR_SE_AUTH_ACCOUNT_LOCKED, "HXR_SE_AUTH_ACCOUNT_LOCKED" }, // 8004192c
{ HXR_SE_AUTH_INVALID_SERVER_CFG, "HXR_SE_AUTH_INVALID_SERVER_CFG" }, // 8004192d
{ HXR_SE_NO_MOBILE_DOWNLOAD, "HXR_SE_NO_MOBILE_DOWNLOAD" }, // 8004192e
{ HXR_SE_NO_MORE_MULTI_ADDR, "HXR_SE_NO_MORE_MULTI_ADDR" }, // 8004192f
{ HXR_PE_PROXY_MAX_CONNECTIONS, "HXR_PE_PROXY_MAX_CONNECTIONS" }, // 80041930
{ HXR_PE_PROXY_MAX_GW_BANDWIDTH, "HXR_PE_PROXY_MAX_GW_BANDWIDTH" }, // 80041931
{ HXR_PE_PROXY_MAX_BANDWIDTH, "HXR_PE_PROXY_MAX_BANDWIDTH" }, // 80041932
{ HXR_SE_BAD_LOADTEST_PASSWORD, "HXR_SE_BAD_LOADTEST_PASSWORD" }, // 80041933
{ HXR_SE_PNA_NOT_SUPPORTED, "HXR_SE_PNA_NOT_SUPPORTED" }, // 80041934
{ HXR_PE_PROXY_ORIGIN_DISCONNECTED, "HXR_PE_PROXY_ORIGIN_DISCONNECTED" }, // 80041935
{ HXR_SE_INTERNAL_ERROR, "HXR_SE_INTERNAL_ERROR" }, // 80041936
{ HXR_SE_MAX_VALUE, "HXR_SE_MAX_VALUE" }, // 80041937
{ 0, 0 }
};
const char*
HXErrorCodeToString( UINT32 ulHXCode )
{
int index;
for ( index = 0; HXCodeToKeyMap[ index ].ulHXCode != 0; ++index )
{
if ( HXCodeToKeyMap[index].ulHXCode == ulHXCode )
{
return HXCodeToKeyMap[ index ].pKeyString;
}
}
return NULL;
}
Index: Umakefil
===================================================================
RCS file: /cvsroot/common/util/Umakefil,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -d -r1.17.2.4 -r1.17.2.5
--- Umakefil 9 Jul 2004 01:48:15 -0000 1.17.2.4
+++ Umakefil 26 Feb 2005 05:16:41 -0000 1.17.2.5
@@ -123,7 +123,8 @@
"hxprefutil.cpp",
"stream_desc_hlpr.cpp",
"hxcbobj.cpp",
- "clone_values.cpp")
+ "clone_values.cpp",
+ "HXErrorCodeStrings.c")
if not project.IsDefined("HELIX_CONFIG_NOSTATICS"):
project.AddSources("getopt.c")
From ping at helixcommunity.org Sat Feb 26 11:24:06 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Sat Feb 26 11:24:08 2005
Subject: [Common-cvs] include hxresult.h,1.28,1.28.2.1
Message-ID:
Update of /cvsroot/common/include
In directory cvs-new:/tmp/cvs-serv13655
Modified Files:
Tag: hxclient_1_5_0_cayenne
hxresult.h
Log Message:
renamed PNR_WARNING to HXR_WARNING
Index: hxresult.h
===================================================================
RCS file: /cvsroot/common/include/hxresult.h,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- hxresult.h 26 Jan 2005 04:16:40 -0000 1.28
+++ hxresult.h 26 Feb 2005 19:24:04 -0000 1.28.2.1
@@ -166,7 +166,7 @@
#define HXR_ALREADY_INITIALIZED MAKE_HX_RESULT(1,SS_GLO,32) // 80040020
#define HXR_NOT_SUPPORTED MAKE_HX_RESULT(1,SS_GLO,33) // 80040021
#define HXR_S_FALSE MAKE_HX_RESULT(0,SS_GLO,34) // 00040022
-#define PNR_WARNING MAKE_HX_RESULT(0,SS_GLO,35) // 00040023
+#define HXR_WARNING MAKE_HX_RESULT(0,SS_GLO,35) // 00040023
#define HXR_BUFFERING MAKE_HX_RESULT(0,SS_NET,0) // 00040040
#define HXR_PAUSED MAKE_HX_RESULT(0,SS_NET,1) // 00040041
From ping at helixcommunity.org Sat Feb 26 11:46:56 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Sat Feb 26 11:46:57 2005
Subject: [Common-cvs] util/pub HXErrorCodeStrings.h,NONE,1.1.4.1
Message-ID:
Update of /cvsroot/common/util/pub
In directory cvs-new:/tmp/cvs-serv30285/pub
Added Files:
Tag: hxclient_1_5_0_cayenne
HXErrorCodeStrings.h
Log Message:
Moved HXErrorCodeStrings from player/hxclientkit
--- NEW FILE: HXErrorCodeStrings.h ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: HXErrorCodeStrings.h,v 1.1.4.1 2005/02/26 19:46:54 ping Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef _HXERROR_CODE_STRINGS_H_
#define _HXERROR_CODE_STRINGS_H_
#ifdef __cplusplus
extern "C" {
#endif
const char* HXErrorCodeToString( UINT32 ulHXCode );
#ifdef __cplusplus
}
#endif
#endif
From ping at helixcommunity.org Sat Feb 26 11:46:56 2005
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Sat Feb 26 11:47:00 2005
Subject: [Common-cvs]
util HXErrorCodeStrings.c, NONE, 1.1.4.1 Umakefil, 1.40, 1.40.2.1
Message-ID:
Update of /cvsroot/common/util
In directory cvs-new:/tmp/cvs-serv30285
Modified Files:
Tag: hxclient_1_5_0_cayenne
Umakefil
Added Files:
Tag: hxclient_1_5_0_cayenne
HXErrorCodeStrings.c
Log Message:
Moved HXErrorCodeStrings from player/hxclientkit
--- NEW FILE: HXErrorCodeStrings.c ---
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id: HXErrorCodeStrings.c,v 1.1.4.1 2005/02/26 19:46:53 ping Exp $
*
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the current version of the RealNetworks Community
* Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your version of
* this file only under the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
*
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#include "hxtypes.h"
#include "hxresult.h"
#include "HXErrorCodeStrings.h"
typedef struct MapHXCodeToKeyRecord
{
UINT32 ulHXCode;
char* pKeyString;
} MapHXCodeToKeyRecord;
static MapHXCodeToKeyRecord const HXCodeToKeyMap[] =
{
{ HXR_NOTIMPL, "HXR_NOTIMPL" }, // 80004001
{ HXR_OUTOFMEMORY, "HXR_OUTOFMEMORY" }, // 8007000e
{ HXR_INVALID_PARAMETER, "HXR_INVALID_PARAMETER" }, // 80070057
{ HXR_NOINTERFACE, "HXR_NOINTERFACE" }, // 80004002
{ HXR_POINTER, "HXR_POINTER" }, // 80004003
{ HXR_HANDLE, "HXR_HANDLE" }, // 80070006
{ HXR_ABORT, "HXR_ABORT" }, // 80004004
{ HXR_FAIL, "HXR_FAIL" }, // 80004005
{ HXR_ACCESSDENIED, "HXR_ACCESSDENIED" }, // 80070005
{ HXR_IGNORE, "HXR_IGNORE" }, // 80000006
{ HXR_INVALID_OPERATION, "HXR_INVALID_OPERATION" }, // 80040004
{ HXR_INVALID_VERSION, "HXR_INVALID_VERSION" }, // 80040005
{ HXR_INVALID_REVISION, "HXR_INVALID_REVISION" }, // 80040006
{ HXR_NOT_INITIALIZED, "HXR_NOT_INITIALIZED" }, // 80040007
{ HXR_DOC_MISSING, "HXR_DOC_MISSING" }, // 80040008
{ HXR_UNEXPECTED, "HXR_UNEXPECTED" }, // 80040009
{ HXR_INCOMPLETE, "HXR_INCOMPLETE" }, // 8004000c
{ HXR_BUFFERTOOSMALL, "HXR_BUFFERTOOSMALL" }, // 8004000d
{ HXR_UNSUPPORTED_VIDEO, "HXR_UNSUPPORTED_VIDEO" }, // 8004000e
{ HXR_UNSUPPORTED_AUDIO, "HXR_UNSUPPORTED_AUDIO" }, // 8004000f
{ HXR_INVALID_BANDWIDTH, "HXR_INVALID_BANDWIDTH" }, // 80040010
{ HXR_NO_RENDERER, "HXR_NO_RENDERER" }, // 80040011
{ HXR_NO_FILEFORMAT, "HXR_NO_FILEFORMAT" }, // 80040011
{ HXR_MISSING_COMPONENTS, "HXR_MISSING_COMPONENTS" }, // 80040011
{ HXR_ELEMENT_NOT_FOUND, "HXR_ELEMENT_NOT_FOUND" }, // 00040012
{ HXR_NOCLASS, "HXR_NOCLASS" }, // 00040013
{ HXR_CLASS_NOAGGREGATION, "HXR_CLASS_NOAGGREGATION" }, // 00040014
{ HXR_NOT_LICENSED, "HXR_NOT_LICENSED" }, // 80040015
{ HXR_NO_FILESYSTEM, "HXR_NO_FILESYSTEM" }, // 80040016
{ HXR_REQUEST_UPGRADE, "HXR_REQUEST_UPGRADE" }, // 80040017
{ HXR_CHECK_RIGHTS, "HXR_CHECK_RIGHTS" }, // 80040018
{ HXR_RESTORE_SERVER_DENIED, "HXR_RESTORE_SERVER_DENIED" }, // 80040019
{ HXR_DEBUGGER_DETECTED, "HXR_DEBUGGER_DETECTED" }, // 8004001a
{ HXR_RESTORE_SERVER_CONNECT, "HXR_RESTORE_SERVER_CONNECT" }, // 8004005c
{ HXR_RESTORE_SERVER_TIMEOUT, "HXR_RESTORE_SERVER_TIMEOUT" }, // 8004005d
{ HXR_REVOKE_SERVER_CONNECT, "HXR_REVOKE_SERVER_CONNECT" }, // 8004005e
{ HXR_REVOKE_SERVER_TIMEOUT, "HXR_REVOKE_SERVER_TIMEOUT" }, // 8004005f
{ HXR_VIEW_RIGHTS_NODRM, "HXR_VIEW_RIGHTS_NODRM" }, // 800401cd
{ HXR_VSRC_NODRM, "HXR_VSRC_NODRM" }, // 800401d3
{ HXR_AWAITING_LICENSE, "HXR_AWAITING_LICENSE" }, // 8004001f
{ HXR_ALREADY_INITIALIZED, "HXR_ALREADY_INITIALIZED" }, // 80040020
{ HXR_NOT_SUPPORTED, "HXR_NOT_SUPPORTED" }, // 80040021
{ HXR_S_FALSE, "HXR_S_FALSE" }, // 00040022
{ HXR_WARNING, "HXR_WARNING" }, // 00040023
{ HXR_BUFFERING, "HXR_BUFFERING" }, // 00040040
{ HXR_PAUSED, "HXR_PAUSED" }, // 00040041
{ HXR_NO_DATA, "HXR_NO_DATA" }, // 00040042
{ HXR_STREAM_DONE, "HXR_STREAM_DONE" }, // 00040043
{ HXR_NET_SOCKET_INVALID, "HXR_NET_SOCKET_INVALID" }, // 80040043
{ HXR_NET_CONNECT, "HXR_NET_CONNECT" }, // 80040044
{ HXR_BIND, "HXR_BIND" }, // 80040045
{ HXR_SOCKET_CREATE, "HXR_SOCKET_CREATE" }, // 80040046
{ HXR_INVALID_HOST, "HXR_INVALID_HOST" }, // 80040047
{ HXR_NET_READ, "HXR_NET_READ" }, // 80040048
{ HXR_NET_WRITE, "HXR_NET_WRITE" }, // 80040049
{ HXR_NET_UDP, "HXR_NET_UDP" }, // 8004004a
{ HXR_RETRY, "HXR_RETRY" }, // 8004004b
{ HXR_SERVER_TIMEOUT, "HXR_SERVER_TIMEOUT" }, // 8004004c
{ HXR_SERVER_DISCONNECTED, "HXR_SERVER_DISCONNECTED" }, // 8004004d
{ HXR_WOULD_BLOCK, "HXR_WOULD_BLOCK" }, // 8004004e
{ HXR_GENERAL_NONET, "HXR_GENERAL_NONET" }, // 8004004f
{ HXR_BLOCK_CANCELED, "HXR_BLOCK_CANCELED" }, // 80040050
{ HXR_MULTICAST_JOIN, "HXR_MULTICAST_JOIN" }, // 80040051
{ HXR_GENERAL_MULTICAST, "HXR_GENERAL_MULTICAST" }, // 80040052
{ HXR_MULTICAST_UDP, "HXR_MULTICAST_UDP" }, // 80040053
{ HXR_AT_INTERRUPT, "HXR_AT_INTERRUPT" }, // 80040054
{ HXR_MSG_TOOLARGE, "HXR_MSG_TOOLARGE" }, // 80040055
{ HXR_NET_TCP, "HXR_NET_TCP" }, // 80040056
{ HXR_TRY_AUTOCONFIG, "HXR_TRY_AUTOCONFIG" }, // 80040057
{ HXR_NOTENOUGH_BANDWIDTH, "HXR_NOTENOUGH_BANDWIDTH" }, // 80040058
{ HXR_HTTP_CONNECT, "HXR_HTTP_CONNECT" }, // 80040059
{ HXR_PORT_IN_USE, "HXR_PORT_IN_USE" }, // 8004005a
{ HXR_LOADTEST_NOT_SUPPORTED, "HXR_LOADTEST_NOT_SUPPORTED" }, // 8004005b
{ HXR_TCP_CONNECT, "HXR_TCP_CONNECT" }, // 00040060
{ HXR_TCP_RECONNECT, "HXR_TCP_RECONNECT" }, // 00040061
{ HXR_TCP_FAILED, "HXR_TCP_FAILED" }, // 80040062
{ HXR_AUTH_SOCKET_CREATE_FAILURE, "HXR_AUTH_SOCKET_CREATE_FAILURE" }, // 80040063
{ HXR_AUTH_TCP_CONNECT_FAILURE, "HXR_AUTH_TCP_CONNECT_FAILURE" }, // 80040064
{ HXR_AUTH_TCP_CONNECT_TIMEOUT, "HXR_AUTH_TCP_CONNECT_TIMEOUT" }, // 80040065
{ HXR_AUTH_FAILURE, "HXR_AUTH_FAILURE" }, // 80040066
{ HXR_AUTH_REQ_PARAMETER_MISSING, "HXR_AUTH_REQ_PARAMETER_MISSING" }, // 80040067
{ HXR_DNS_RESOLVE_FAILURE, "HXR_DNS_RESOLVE_FAILURE" }, // 80040068
{ HXR_AUTH_SUCCEEDED, "HXR_AUTH_SUCCEEDED" }, // 00040068
{ HXR_PULL_AUTHENTICATION_FAILED, "HXR_PULL_AUTHENTICATION_FAILED" }, // 80040069
{ HXR_BIND_ERROR, "HXR_BIND_ERROR" }, // 8004006a
{ HXR_PULL_PING_TIMEOUT, "HXR_PULL_PING_TIMEOUT" }, // 8004006b
{ HXR_AUTH_TCP_FAILED, "HXR_AUTH_TCP_FAILED" }, // 8004006c
{ HXR_UNEXPECTED_STREAM_END, "HXR_UNEXPECTED_STREAM_END" }, // 8004006d
{ HXR_AUTH_READ_TIMEOUT, "HXR_AUTH_READ_TIMEOUT" }, // 8004006e
{ HXR_AUTH_CONNECTION_FAILURE, "HXR_AUTH_CONNECTION_FAILURE" }, // 8004006f
{ HXR_BLOCKED, "HXR_BLOCKED" }, // 80040070
{ HXR_NOTENOUGH_PREDECBUF, "HXR_NOTENOUGH_PREDECBUF" }, // 80040071
{ HXR_AT_END, "HXR_AT_END" }, // 00040080
{ HXR_INVALID_FILE, "HXR_INVALID_FILE" }, // 80040081
{ HXR_INVALID_PATH, "HXR_INVALID_PATH" }, // 80040082
{ HXR_RECORD, "HXR_RECORD" }, // 80040083
{ HXR_RECORD_WRITE, "HXR_RECORD_WRITE" }, // 80040084
{ HXR_TEMP_FILE, "HXR_TEMP_FILE" }, // 80040085
{ HXR_ALREADY_OPEN, "HXR_ALREADY_OPEN" }, // 80040086
{ HXR_SEEK_PENDING, "HXR_SEEK_PENDING" }, // 80040087
{ HXR_CANCELLED, "HXR_CANCELLED" }, // 80040088
{ HXR_FILE_NOT_FOUND, "HXR_FILE_NOT_FOUND" }, // 80040089
{ HXR_WRITE_ERROR, "HXR_WRITE_ERROR" }, // 8004008a
{ HXR_FILE_EXISTS, "HXR_FILE_EXISTS" }, // 8004008b
{ HXR_FILE_NOT_OPEN, "HXR_FILE_NOT_OPEN" }, // 8004008c
{ HXR_ADVISE_PREFER_LINEAR, "HXR_ADVISE_PREFER_LINEAR" }, // 0004008d
{ HXR_PARSE_ERROR, "HXR_PARSE_ERROR" }, // 8004008e
{ HXR_ADVISE_NOASYNC_SEEK, "HXR_ADVISE_NOASYNC_SEEK" }, // 0004008f
{ HXR_HEADER_PARSE_ERROR, "HXR_HEADER_PARSE_ERROR" }, // 80040090
{ HXR_CORRUPT_FILE , "HXR_CORRUPT_FILE " }, // 80040091
{ HXR_BAD_SERVER, "HXR_BAD_SERVER" }, // 800400c0
{ HXR_ADVANCED_SERVER, "HXR_ADVANCED_SERVER" }, // 800400c1
{ HXR_OLD_SERVER, "HXR_OLD_SERVER" }, // 800400c2
{ HXR_REDIRECTION, "HXR_REDIRECTION" }, // 000400c3
{ HXR_SERVER_ALERT, "HXR_SERVER_ALERT" }, // 800400c4
{ HXR_PROXY, "HXR_PROXY" }, // 800400c5
{ HXR_PROXY_RESPONSE, "HXR_PROXY_RESPONSE" }, // 800400c6
{ HXR_ADVANCED_PROXY, "HXR_ADVANCED_PROXY" }, // 800400c7
{ HXR_OLD_PROXY, "HXR_OLD_PROXY" }, // 800400c8
{ HXR_INVALID_PROTOCOL, "HXR_INVALID_PROTOCOL" }, // 800400c9
{ HXR_INVALID_URL_OPTION, "HXR_INVALID_URL_OPTION" }, // 800400ca
{ HXR_INVALID_URL_HOST, "HXR_INVALID_URL_HOST" }, // 800400cb
{ HXR_INVALID_URL_PATH, "HXR_INVALID_URL_PATH" }, // 800400cc
{ HXR_HTTP_CONTENT_NOT_FOUND, "HXR_HTTP_CONTENT_NOT_FOUND" }, // 800400cd
{ HXR_NOT_AUTHORIZED, "HXR_NOT_AUTHORIZED" }, // 800400ce
{ HXR_UNEXPECTED_MSG, "HXR_UNEXPECTED_MSG" }, // 800400cf
{ HXR_BAD_TRANSPORT, "HXR_BAD_TRANSPORT" }, // 800400d0
{ HXR_NO_SESSION_ID, "HXR_NO_SESSION_ID" }, // 800400d1
{ HXR_PROXY_DNR, "HXR_PROXY_DNR" }, // 800400d2
{ HXR_PROXY_NET_CONNECT, "HXR_PROXY_NET_CONNECT" }, // 800400d3
{ HXR_AGGREGATE_OP_NOT_ALLOWED, "HXR_AGGREGATE_OP_NOT_ALLOWED" }, // 800400d4
{ HXR_RIGHTS_EXPIRED, "HXR_RIGHTS_EXPIRED" }, // 800400d5
{ HXR_NOT_MODIFIED, "HXR_NOT_MODIFIED" }, // 800400d6
{ HXR_FORBIDDEN, "HXR_FORBIDDEN" }, // 800400d7
{ HXR_AUDIO_DRIVER, "HXR_AUDIO_DRIVER" }, // 80040100
{ HXR_LATE_PACKET, "HXR_LATE_PACKET" }, // 80040101
{ HXR_OVERLAPPED_PACKET, "HXR_OVERLAPPED_PACKET" }, // 80040102
{ HXR_OUTOFORDER_PACKET, "HXR_OUTOFORDER_PACKET" }, // 80040103
{ HXR_NONCONTIGUOUS_PACKET, "HXR_NONCONTIGUOUS_PACKET" }, // 80040104
{ HXR_OPEN_NOT_PROCESSED, "HXR_OPEN_NOT_PROCESSED" }, // 80040140
{ HXR_WINDRAW_EXCEPTION, "HXR_WINDRAW_EXCEPTION" }, // 80040141
{ HXR_EXPIRED, "HXR_EXPIRED" }, // 80040180
{ HXR_INVALID_INTERLEAVER, "HXR_INVALID_INTERLEAVER" }, // 80040fc0
{ HXR_BAD_FORMAT, "HXR_BAD_FORMAT" }, // 80040fc1
{ HXR_CHUNK_MISSING, "HXR_CHUNK_MISSING" }, // 80040fc2
{ HXR_INVALID_STREAM, "HXR_INVALID_STREAM" }, // 80040fc3
{ HXR_DNR, "HXR_DNR" }, // 80040fc4
{ HXR_OPEN_DRIVER, "HXR_OPEN_DRIVER" }, // 80040fc5
{ HXR_UPGRADE, "HXR_UPGRADE" }, // 80040fc6
{ HXR_NOTIFICATION, "HXR_NOTIFICATION" }, // 80040fc7
{ HXR_NOT_NOTIFIED, "HXR_NOT_NOTIFIED" }, // 80040fc8
{ HXR_STOPPED, "HXR_STOPPED" }, // 80040fc9
{ HXR_CLOSED, "HXR_CLOSED" }, // 80040fca
{ HXR_INVALID_WAV_FILE, "HXR_INVALID_WAV_FILE" }, // 80040fcb
{ HXR_NO_SEEK, "HXR_NO_SEEK" }, // 80040fcc
{ HXR_DEC_INITED, "HXR_DEC_INITED" }, // 80040200
{ HXR_DEC_NOT_FOUND, "HXR_DEC_NOT_FOUND" }, // 80040201
{ HXR_DEC_INVALID, "HXR_DEC_INVALID" }, // 80040202
{ HXR_DEC_TYPE_MISMATCH, "HXR_DEC_TYPE_MISMATCH" }, // 80040203
{ HXR_DEC_INIT_FAILED, "HXR_DEC_INIT_FAILED" }, // 80040204
{ HXR_DEC_NOT_INITED, "HXR_DEC_NOT_INITED" }, // 80040205
{ HXR_DEC_DECOMPRESS, "HXR_DEC_DECOMPRESS" }, // 80040206
{ HXR_OBSOLETE_VERSION, "HXR_OBSOLETE_VERSION" }, // 80040207
{ HXR_ENC_FILE_TOO_SMALL, "HXR_ENC_FILE_TOO_SMALL" }, // 80040240
{ HXR_ENC_UNKNOWN_FILE, "HXR_ENC_UNKNOWN_FILE" }, // 80040241
{ HXR_ENC_BAD_CHANNELS, "HXR_ENC_BAD_CHANNELS" }, // 80040242
{ HXR_ENC_BAD_SAMPSIZE, "HXR_ENC_BAD_SAMPSIZE" }, // 80040243
{ HXR_ENC_BAD_SAMPRATE, "HXR_ENC_BAD_SAMPRATE" }, // 80040244
{ HXR_ENC_INVALID, "HXR_ENC_INVALID" }, // 80040245
{ HXR_ENC_NO_OUTPUT_FILE, "HXR_ENC_NO_OUTPUT_FILE" }, // 80040246
{ HXR_ENC_NO_INPUT_FILE, "HXR_ENC_NO_INPUT_FILE" }, // 80040247
{ HXR_ENC_NO_OUTPUT_PERMISSIONS, "HXR_ENC_NO_OUTPUT_PERMISSIONS" }, // 80040248
{ HXR_ENC_BAD_FILETYPE, "HXR_ENC_BAD_FILETYPE" }, // 80040249
{ HXR_ENC_INVALID_VIDEO, "HXR_ENC_INVALID_VIDEO" }, // 8004024a
{ HXR_ENC_INVALID_AUDIO, "HXR_ENC_INVALID_AUDIO" }, // 8004024b
{ HXR_ENC_NO_VIDEO_CAPTURE, "HXR_ENC_NO_VIDEO_CAPTURE" }, // 8004024c
{ HXR_ENC_INVALID_VIDEO_CAPTURE, "HXR_ENC_INVALID_VIDEO_CAPTURE" }, // 8004024d
{ HXR_ENC_NO_AUDIO_CAPTURE, "HXR_ENC_NO_AUDIO_CAPTURE" }, // 8004024e
{ HXR_ENC_INVALID_AUDIO_CAPTURE, "HXR_ENC_INVALID_AUDIO_CAPTURE" }, // 8004024f
{ HXR_ENC_TOO_SLOW_FOR_LIVE, "HXR_ENC_TOO_SLOW_FOR_LIVE" }, // 80040250
{ HXR_ENC_ENGINE_NOT_INITIALIZED, "HXR_ENC_ENGINE_NOT_INITIALIZED" }, // 80040251
{ HXR_ENC_CODEC_NOT_FOUND, "HXR_ENC_CODEC_NOT_FOUND" }, // 80040252
{ HXR_ENC_CODEC_NOT_INITIALIZED, "HXR_ENC_CODEC_NOT_INITIALIZED" }, // 80040253
{ HXR_ENC_INVALID_INPUT_DIMENSIONS, "HXR_ENC_INVALID_INPUT_DIMENSIONS" }, // 80040254
{ HXR_ENC_MESSAGE_IGNORED, "HXR_ENC_MESSAGE_IGNORED" }, // 80040255
{ HXR_ENC_NO_SETTINGS, "HXR_ENC_NO_SETTINGS" }, // 80040256
{ HXR_ENC_NO_OUTPUT_TYPES, "HXR_ENC_NO_OUTPUT_TYPES" }, // 80040257
{ HXR_ENC_IMPROPER_STATE, "HXR_ENC_IMPROPER_STATE" }, // 80040258
{ HXR_ENC_INVALID_SERVER, "HXR_ENC_INVALID_SERVER" }, // 80040259
{ HXR_ENC_INVALID_TEMP_PATH, "HXR_ENC_INVALID_TEMP_PATH" }, // 8004025a
{ HXR_ENC_MERGE_FAIL, "HXR_ENC_MERGE_FAIL" }, // 8004025b
{ HXR_BIN_DATA_NOT_FOUND, "HXR_BIN_DATA_NOT_FOUND" }, // 0004025c
{ HXR_BIN_END_OF_DATA, "HXR_BIN_END_OF_DATA" }, // 0004025d
{ HXR_BIN_DATA_PURGED, "HXR_BIN_DATA_PURGED" }, // 8004025e
{ HXR_BIN_FULL, "HXR_BIN_FULL" }, // 8004025f
{ HXR_BIN_OFFSET_PAST_END, "HXR_BIN_OFFSET_PAST_END" }, // 80040260
{ HXR_ENC_NO_ENCODED_DATA, "HXR_ENC_NO_ENCODED_DATA" }, // 80040261
{ HXR_ENC_INVALID_DLL, "HXR_ENC_INVALID_DLL" }, // 80040262
{ HXR_NOT_INDEXABLE, "HXR_NOT_INDEXABLE" }, // 80040263
{ HXR_ENC_NO_BROWSER, "HXR_ENC_NO_BROWSER" }, // 80040264
{ HXR_ENC_NO_FILE_TO_SERVER, "HXR_ENC_NO_FILE_TO_SERVER" }, // 80040265
{ HXR_ENC_INSUFFICIENT_DISK_SPACE, "HXR_ENC_INSUFFICIENT_DISK_SPACE" }, // 80040266
{ HXR_ENC_SAMPLE_DISCARDED, "HXR_ENC_SAMPLE_DISCARDED" }, // 00040267
{ HXR_ENC_RV10_FRAME_TOO_LARGE, "HXR_ENC_RV10_FRAME_TOO_LARGE" }, // 80040268
{ HXR_S_NOT_HANDLED, "HXR_S_NOT_HANDLED" }, // 00040269
{ HXR_S_END_OF_STREAM, "HXR_S_END_OF_STREAM" }, // 0004026a
{ HXR_S_JOBFILE_INCOMPLETE, "HXR_S_JOBFILE_INCOMPLETE" }, //
{ HXR_S_NOTHING_TO_SERIALIZE, "HXR_S_NOTHING_TO_SERIALIZE" }, //
{ HXR_SIZENOTSET, "HXR_SIZENOTSET" }, //
{ HXR_ALREADY_COMMITTED, "HXR_ALREADY_COMMITTED" }, //
{ HXR_BUFFERS_OUTSTANDING, "HXR_BUFFERS_OUTSTANDING" }, //
{ HXR_NOT_COMMITTED, "HXR_NOT_COMMITTED" }, //
{ HXR_SAMPLE_TIME_NOT_SET, "HXR_SAMPLE_TIME_NOT_SET" }, //
{ HXR_TIMEOUT, "HXR_TIMEOUT" }, //
{ HXR_WRONGSTATE, "HXR_WRONGSTATE" }, //
{ HXR_RMT_USAGE_ERROR, "HXR_RMT_USAGE_ERROR" }, // 800403c1
{ HXR_RMT_INVALID_ENDTIME, "HXR_RMT_INVALID_ENDTIME" }, // 800403c2
{ HXR_RMT_MISSING_INPUT_FILE, "HXR_RMT_MISSING_INPUT_FILE" }, // 800403c3
{ HXR_RMT_MISSING_OUTPUT_FILE, "HXR_RMT_MISSING_OUTPUT_FILE" }, // 800403c4
{ HXR_RMT_INPUT_EQUALS_OUTPUT_FILE, "HXR_RMT_INPUT_EQUALS_OUTPUT_FILE" }, // 800403c5
{ HXR_RMT_UNSUPPORTED_AUDIO_VERSION, "HXR_RMT_UNSUPPORTED_AUDIO_VERSION" }, // 800403c6
{ HXR_RMT_DIFFERENT_AUDIO, "HXR_RMT_DIFFERENT_AUDIO" }, // 800403c7
{ HXR_RMT_DIFFERENT_VIDEO, "HXR_RMT_DIFFERENT_VIDEO" }, // 800403c8
{ HXR_RMT_PASTE_MISSING_STREAM, "HXR_RMT_PASTE_MISSING_STREAM" }, // 800403c9
{ HXR_RMT_END_OF_STREAM, "HXR_RMT_END_OF_STREAM" }, // 800403ca
{ HXR_RMT_IMAGE_MAP_PARSE_ERROR, "HXR_RMT_IMAGE_MAP_PARSE_ERROR" }, // 800403cb
{ HXR_RMT_INVALID_IMAGEMAP_FILE, "HXR_RMT_INVALID_IMAGEMAP_FILE" }, // 800403cc
{ HXR_RMT_EVENT_PARSE_ERROR, "HXR_RMT_EVENT_PARSE_ERROR" }, // 800403cd
{ HXR_RMT_INVALID_EVENT_FILE, "HXR_RMT_INVALID_EVENT_FILE" }, // 800403ce
{ HXR_RMT_INVALID_OUTPUT_FILE, "HXR_RMT_INVALID_OUTPUT_FILE" }, // 800403cf
{ HXR_RMT_INVALID_DURATION, "HXR_RMT_INVALID_DURATION" }, // 800403d0
{ HXR_RMT_NO_DUMP_FILES, "HXR_RMT_NO_DUMP_FILES" }, // 800403d1
{ HXR_RMT_NO_EVENT_DUMP_FILE, "HXR_RMT_NO_EVENT_DUMP_FILE" }, // 800403d2
{ HXR_RMT_NO_IMAP_DUMP_FILE, "HXR_RMT_NO_IMAP_DUMP_FILE" }, // 800403d3
{ HXR_RMT_NO_DATA, "HXR_RMT_NO_DATA" }, // 800403d4
{ HXR_RMT_EMPTY_STREAM, "HXR_RMT_EMPTY_STREAM" }, // 800403d5
{ HXR_RMT_READ_ONLY_FILE, "HXR_RMT_READ_ONLY_FILE" }, // 800403d6
{ HXR_RMT_PASTE_MISSING_AUDIO_STREAM, "HXR_RMT_PASTE_MISSING_AUDIO_STREAM" }, // 800403d7
{ HXR_RMT_PASTE_MISSING_VIDEO_STREAM, "HXR_RMT_PASTE_MISSING_VIDEO_STREAM" }, // 800403d8
{ HXR_RMT_ENCRYPTED_CONTENT, "HXR_RMT_ENCRYPTED_CONTENT" }, // 800403d9
{ HXR_PROP_NOT_FOUND, "HXR_PROP_NOT_FOUND" }, // 80040281
{ HXR_PROP_NOT_COMPOSITE, "HXR_PROP_NOT_COMPOSITE" }, // 80040282
{ HXR_PROP_DUPLICATE, "HXR_PROP_DUPLICATE" }, // 80040283
{ HXR_PROP_TYPE_MISMATCH, "HXR_PROP_TYPE_MISMATCH" }, // 80040284
{ HXR_PROP_ACTIVE, "HXR_PROP_ACTIVE" }, // 80040285
{ HXR_PROP_INACTIVE, "HXR_PROP_INACTIVE" }, // 80040286
{ HXR_PROP_VAL_UNDERFLOW, "HXR_PROP_VAL_UNDERFLOW" }, // 80040287
{ HXR_PROP_VAL_OVERFLOW, "HXR_PROP_VAL_OVERFLOW" }, // 80040288
{ HXR_PROP_VAL_LT_LBOUND, "HXR_PROP_VAL_LT_LBOUND" }, // 80040289
{ HXR_PROP_VAL_GT_UBOUND, "HXR_PROP_VAL_GT_UBOUND" }, // 8004028a
{ HXR_PROP_DELETE_PENDING, "HXR_PROP_DELETE_PENDING" }, // 0004028b
{ HXR_COULDNOTINITCORE, "HXR_COULDNOTINITCORE" }, // 800401c1
{ HXR_PERFECTPLAY_NOT_SUPPORTED, "HXR_PERFECTPLAY_NOT_SUPPORTED" }, // 800401c2
{ HXR_NO_LIVE_PERFECTPLAY, "HXR_NO_LIVE_PERFECTPLAY" }, // 800401c3
{ HXR_PERFECTPLAY_NOT_ALLOWED, "HXR_PERFECTPLAY_NOT_ALLOWED" }, // 800401c4
{ HXR_NO_CODECS, "HXR_NO_CODECS" }, // 800401c5
{ HXR_SLOW_MACHINE, "HXR_SLOW_MACHINE" }, // 800401c6
{ HXR_FORCE_PERFECTPLAY, "HXR_FORCE_PERFECTPLAY" }, // 800401c7
{ HXR_INVALID_HTTP_PROXY_HOST, "HXR_INVALID_HTTP_PROXY_HOST" }, // 800401c8
{ HXR_INVALID_METAFILE, "HXR_INVALID_METAFILE" }, // 800401c9
{ HXR_BROWSER_LAUNCH, "HXR_BROWSER_LAUNCH" }, // 800401ca
{ HXR_VIEW_SOURCE_NOCLIP, "HXR_VIEW_SOURCE_NOCLIP" }, // 800401cb
{ HXR_VIEW_SOURCE_DISSABLED, "HXR_VIEW_SOURCE_DISSABLED" }, // 800401cc
{ HXR_TIMELINE_SUSPENDED, "HXR_TIMELINE_SUSPENDED" }, // 800401ce
{ HXR_BUFFER_NOT_AVAILABLE, "HXR_BUFFER_NOT_AVAILABLE" }, // 800401cf
{ HXR_COULD_NOT_DISPLAY, "HXR_COULD_NOT_DISPLAY" }, // 800401d0
{ HXR_VSRC_DISABLED, "HXR_VSRC_DISABLED" }, // 800401d1
{ HXR_VSRC_NOCLIP, "HXR_VSRC_NOCLIP" }, // 800401d2
{ HXR_RESOURCE_NOT_CACHED, "HXR_RESOURCE_NOT_CACHED" }, // 80040301
{ HXR_RESOURCE_NOT_FOUND, "HXR_RESOURCE_NOT_FOUND" }, // 80040302
{ HXR_RESOURCE_CLOSE_FILE_FIRST, "HXR_RESOURCE_CLOSE_FILE_FIRST" }, // 80040303
{ HXR_RESOURCE_NODATA, "HXR_RESOURCE_NODATA" }, // 80040304
{ HXR_RESOURCE_BADFILE, "HXR_RESOURCE_BADFILE" }, // 80040305
{ HXR_RESOURCE_PARTIALCOPY, "HXR_RESOURCE_PARTIALCOPY" }, // 80040306
{ HXR_PPV_NO_USER, "HXR_PPV_NO_USER" }, // 800402c0
{ HXR_PPV_GUID_READ_ONLY, "HXR_PPV_GUID_READ_ONLY" }, // 800402c1
{ HXR_PPV_GUID_COLLISION, "HXR_PPV_GUID_COLLISION" }, // 800402c2
{ HXR_REGISTER_GUID_EXISTS, "HXR_REGISTER_GUID_EXISTS" }, // 800402c3
{ HXR_PPV_AUTHORIZATION_FAILED, "HXR_PPV_AUTHORIZATION_FAILED" }, // 800402c4
{ HXR_PPV_OLD_PLAYER, "HXR_PPV_OLD_PLAYER" }, // 800402c5
{ HXR_PPV_ACCOUNT_LOCKED, "HXR_PPV_ACCOUNT_LOCKED" }, // 800402c6
{ HXR_PPV_DBACCESS_ERROR, "HXR_PPV_DBACCESS_ERROR" }, // 800402c8
{ HXR_PPV_USER_ALREADY_EXISTS, "HXR_PPV_USER_ALREADY_EXISTS" }, // 800402c9
{ HXR_UPG_AUTH_FAILED, "HXR_UPG_AUTH_FAILED" }, // 80040340
{ HXR_UPG_CERT_AUTH_FAILED, "HXR_UPG_CERT_AUTH_FAILED" }, // 80040341
{ HXR_UPG_CERT_EXPIRED, "HXR_UPG_CERT_EXPIRED" }, // 80040342
{ HXR_UPG_CERT_REVOKED, "HXR_UPG_CERT_REVOKED" }, // 80040343
{ HXR_UPG_RUP_BAD, "HXR_UPG_RUP_BAD" }, // 80040344
{ HXR_UPG_SYSTEM_BUSY, "HXR_UPG_SYSTEM_BUSY" }, // 80040345
{ HXR_AUTOCFG_SUCCESS, "HXR_AUTOCFG_SUCCESS" }, // 80040345
{ HXR_AUTOCFG_FAILED, "HXR_AUTOCFG_FAILED" }, // 80040345
{ HXR_AUTOCFG_ABORT, "HXR_AUTOCFG_ABORT" }, // 80040345
{ HXR_UNKNOWN_IMAGE, "HXR_UNKNOWN_IMAGE" }, // 80040345
{ HXR_UNKNOWN_EFFECT, "HXR_UNKNOWN_EFFECT" }, // 80040345
{ HXR_SENDIMAGE_ABORTED, "HXR_SENDIMAGE_ABORTED" }, // 80040345
{ HXR_SENDEFFECT_ABORTED, "HXR_SENDEFFECT_ABORTED" }, // 80040345
{ HXR_SE_MIN_VALUE, "HXR_SE_MIN_VALUE" }, // 80041800
{ HXR_SE_NO_ERROR, "HXR_SE_NO_ERROR" }, // 80041901
{ HXR_SE_INVALID_VERSION, "HXR_SE_INVALID_VERSION" }, // 80041902
{ HXR_SE_INVALID_FORMAT, "HXR_SE_INVALID_FORMAT" }, // 80041903
{ HXR_SE_INVALID_BANDWIDTH, "HXR_SE_INVALID_BANDWIDTH" }, // 80041904
{ HXR_SE_INVALID_PATH, "HXR_SE_INVALID_PATH" }, // 80041905
{ HXR_SE_UNKNOWN_PATH, "HXR_SE_UNKNOWN_PATH" }, // 80041906
{ HXR_SE_INVALID_PROTOCOL, "HXR_SE_INVALID_PROTOCOL" }, // 80041907
{ HXR_SE_INVALID_PLAYER_ADDR, "HXR_SE_INVALID_PLAYER_ADDR" }, // 80041908
{ HXR_SE_LOCAL_STREAMS_PROHIBITED, "HXR_SE_LOCAL_STREAMS_PROHIBITED" }, // 80041909
{ HXR_SE_SERVER_FULL, "HXR_SE_SERVER_FULL" }, // 8004190a
{ HXR_SE_REMOTE_STREAMS_PROHIBITED, "HXR_SE_REMOTE_STREAMS_PROHIBITED" }, // 8004190b
{ HXR_SE_EVENT_STREAMS_PROHIBITED, "HXR_SE_EVENT_STREAMS_PROHIBITED" }, // 8004190c
{ HXR_SE_INVALID_HOST, "HXR_SE_INVALID_HOST" }, // 8004190d
{ HXR_SE_NO_CODEC, "HXR_SE_NO_CODEC" }, // 8004190e
{ HXR_SE_LIVEFILE_INVALID_BWN, "HXR_SE_LIVEFILE_INVALID_BWN" }, // 8004190f
{ HXR_SE_UNABLE_TO_FULFILL, "HXR_SE_UNABLE_TO_FULFILL" }, // 80041910
{ HXR_SE_MULTICAST_DELIVERY_ONLY, "HXR_SE_MULTICAST_DELIVERY_ONLY" }, // 80041911
{ HXR_SE_LICENSE_EXCEEDED, "HXR_SE_LICENSE_EXCEEDED" }, // 80041912
{ HXR_SE_LICENSE_UNAVAILABLE, "HXR_SE_LICENSE_UNAVAILABLE" }, // 80041913
{ HXR_SE_INVALID_LOSS_CORRECTION, "HXR_SE_INVALID_LOSS_CORRECTION" }, // 80041914
{ HXR_SE_PROTOCOL_FAILURE, "HXR_SE_PROTOCOL_FAILURE" }, // 80041915
{ HXR_SE_REALVIDEO_STREAMS_PROHIBITED, "HXR_SE_REALVIDEO_STREAMS_PROHIBITED" }, // 80041916
{ HXR_SE_REALAUDIO_STREAMS_PROHIBITED, "HXR_SE_REALAUDIO_STREAMS_PROHIBITED" }, // 80041917
{ HXR_SE_DATATYPE_UNSUPPORTED, "HXR_SE_DATATYPE_UNSUPPORTED" }, // 80041918
{ HXR_SE_DATATYPE_UNLICENSED, "HXR_SE_DATATYPE_UNLICENSED" }, // 80041919
{ HXR_SE_RESTRICTED_PLAYER, "HXR_SE_RESTRICTED_PLAYER" }, // 8004191a
{ HXR_SE_STREAM_INITIALIZING, "HXR_SE_STREAM_INITIALIZING" }, // 8004191b
{ HXR_SE_INVALID_PLAYER, "HXR_SE_INVALID_PLAYER" }, // 8004191c
{ HXR_SE_PLAYER_PLUS_ONLY, "HXR_SE_PLAYER_PLUS_ONLY" }, // 8004191d
{ HXR_SE_NO_EMBEDDED_PLAYERS, "HXR_SE_NO_EMBEDDED_PLAYERS" }, // 8004191e
{ HXR_SE_PNA_PROHIBITED, "HXR_SE_PNA_PROHIBITED" }, // 8004191f
{ HXR_SE_AUTHENTICATION_UNSUPPORTED, "HXR_SE_AUTHENTICATION_UNSUPPORTED" }, // 80041920
{ HXR_SE_MAX_FAILED_AUTHENTICATIONS, "HXR_SE_MAX_FAILED_AUTHENTICATIONS" }, // 80041921
{ HXR_SE_AUTH_ACCESS_DENIED, "HXR_SE_AUTH_ACCESS_DENIED" }, // 80041922
{ HXR_SE_AUTH_UUID_READ_ONLY, "HXR_SE_AUTH_UUID_READ_ONLY" }, // 80041923
{ HXR_SE_AUTH_UUID_NOT_UNIQUE, "HXR_SE_AUTH_UUID_NOT_UNIQUE" }, // 80041924
{ HXR_SE_AUTH_NO_SUCH_USER, "HXR_SE_AUTH_NO_SUCH_USER" }, // 80041925
{ HXR_SE_AUTH_REGISTRATION_SUCCEEDED, "HXR_SE_AUTH_REGISTRATION_SUCCEEDED" }, // 80041926
{ HXR_SE_AUTH_REGISTRATION_FAILED, "HXR_SE_AUTH_REGISTRATION_FAILED" }, // 80041927
{ HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED, "HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED" }, // 80041928
{ HXR_SE_AUTH_UNREGISTERED_PLAYER, "HXR_SE_AUTH_UNREGISTERED_PLAYER" }, // 80041929
{ HXR_SE_AUTH_TIME_EXPIRED, "HXR_SE_AUTH_TIME_EXPIRED" }, // 8004192a
{ HXR_SE_AUTH_NO_TIME_LEFT, "HXR_SE_AUTH_NO_TIME_LEFT" }, // 8004192b
{ HXR_SE_AUTH_ACCOUNT_LOCKED, "HXR_SE_AUTH_ACCOUNT_LOCKED" }, // 8004192c
{ HXR_SE_AUTH_INVALID_SERVER_CFG, "HXR_SE_AUTH_INVALID_SERVER_CFG" }, // 8004192d
{ HXR_SE_NO_MOBILE_DOWNLOAD, "HXR_SE_NO_MOBILE_DOWNLOAD" }, // 8004192e
{ HXR_SE_NO_MORE_MULTI_ADDR, "HXR_SE_NO_MORE_MULTI_ADDR" }, // 8004192f
{ HXR_PE_PROXY_MAX_CONNECTIONS, "HXR_PE_PROXY_MAX_CONNECTIONS" }, // 80041930
{ HXR_PE_PROXY_MAX_GW_BANDWIDTH, "HXR_PE_PROXY_MAX_GW_BANDWIDTH" }, // 80041931
{ HXR_PE_PROXY_MAX_BANDWIDTH, "HXR_PE_PROXY_MAX_BANDWIDTH" }, // 80041932
{ HXR_SE_BAD_LOADTEST_PASSWORD, "HXR_SE_BAD_LOADTEST_PASSWORD" }, // 80041933
{ HXR_SE_PNA_NOT_SUPPORTED, "HXR_SE_PNA_NOT_SUPPORTED" }, // 80041934
{ HXR_PE_PROXY_ORIGIN_DISCONNECTED, "HXR_PE_PROXY_ORIGIN_DISCONNECTED" }, // 80041935
{ HXR_SE_INTERNAL_ERROR, "HXR_SE_INTERNAL_ERROR" }, // 80041936
{ HXR_SE_MAX_VALUE, "HXR_SE_MAX_VALUE" }, // 80041937
{ 0, 0 }
};
const char*
HXErrorCodeToString( UINT32 ulHXCode )
{
int index;
for ( index = 0; HXCodeToKeyMap[ index ].ulHXCode != 0; ++index )
{
if ( HXCodeToKeyMap[index].ulHXCode == ulHXCode )
{
return HXCodeToKeyMap[ index ].pKeyString;
}
}
return NULL;
}
Index: Umakefil
===================================================================
RCS file: /cvsroot/common/util/Umakefil,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -d -r1.40 -r1.40.2.1
--- Umakefil 25 Jan 2005 17:58:45 -0000 1.40
+++ Umakefil 26 Feb 2005 19:46:53 -0000 1.40.2.1
@@ -139,7 +139,8 @@
"hxabdutil.cpp",
"hxmovavg.cpp",
"hxmovmed.cpp",
- "bufnum.cpp")
+ "bufnum.cpp",
+ "HXErrorCodeStrings.c")
project.AddSources("tconverter/fxpoint/tconverter_fxp.cpp")
From ehyche at helixcommunity.org Mon Feb 28 10:04:25 2005
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Mon Feb 28 10:04:26 2005
Subject: [Common-cvs] build/BIF helix.bif,1.504,1.505
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv16690
Modified Files:
helix.bif
Log Message:
Update ra8hbr dist lib sdk names.
CR ping@real.com
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -d -r1.504 -r1.505
--- helix.bif 24 Feb 2005 18:23:31 -0000 1.504
+++ helix.bif 28 Feb 2005 18:04:23 -0000 1.505
@@ -7100,8 +7100,8 @@
unix mac win32 tm1 symbian wince
-
-
+
+
From ehyche at helixcommunity.org Mon Feb 28 10:49:50 2005
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Mon Feb 28 10:49:51 2005
Subject: [Common-cvs] build/BIF helix.bif,1.505,1.506
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs-new:/tmp/cvs-serv18542
Modified Files:
helix.bif
Log Message:
Make datatype_tools_xmlwriter a dependency
of datatype_tools_dtdriver_apps_dtdrive.
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -d -r1.505 -r1.506
--- helix.bif 28 Feb 2005 18:04:23 -0000 1.505
+++ helix.bif 28 Feb 2005 18:49:47 -0000 1.506
@@ -2104,6 +2104,7 @@
datatype_tools_dtdriver_engine
datatype_tools_dtdriver_decoder
datatype_tools_binwrtr
+ datatype_tools_xmlwriter
datatype_tools_minicntx
producersdk_include
producersdk_common_include
Copyright © 1995-2007 RealNetworks, Inc. All rights reserved.
RealNetworks and Helix are trademarks of RealNetworks.
All other trademarks or registered trademarks are the property of their respective holders.