List Info

Thread: CR-Client: get WM-RTSP building/working on Linux (with diffs)
CR-Client: get WM-RTSP building/working on Linux (with diffs)
user name
 2006-10-23 18:48:44 
[Making sure diff file is attached this time...]



=====================================
Eric Hyche, Technical Lead
RealNetworks, Inc.
ehychereal.com
Index: hxcom.h
============================================================
=======
RCS file: /cvsroot/common/include/hxcom.h,v
retrieving revision 1.29
diff -u -w -r1.29 hxcom.h
--- hxcom.h	18 Oct 2006 21:14:13 -0000	1.29
+++ hxcom.h	23 Oct 2006 17:39:00 -0000
 -502,9
+502,13 
  *	
  *
  */
+#if !defined(HXCOM_NO_IUNKNOWN_GUID_DEFINE)
+
 DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0,
0x00, 
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
 
+#endif /* #if !defined(HXCOM_NO_IUNKNOWN_GUID_DEFINE) */
+
 #undef  INTERFACE
 #define INTERFACE   IUnknown
 
 -535,9
+539,14 
  *	
  *
  */
+
+#if !defined(HXCOM_NO_IMALLOC_GUID_DEFINE)
+
 DEFINE_GUID(IID_IMalloc, 00000002, 0x0000, 0x0000, 0xC0,
0x00, 
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
 
+#endif /* #if !defined(HXCOM_NO_IMALLOC_GUID_DEFINE) */
+
 #undef  INTERFACE
 #define INTERFACE   IMalloc
 
 -605,11
+614,21 
 /* Even in windows we want these GUID's defined... */
 
 #if !(defined(INITGUID) &&
defined(USE_IUNKNOWN_AND_IMALLOC_FROM_UUID_LIB))
+
+#if !defined(HXCOM_NO_IUNKNOWN_GUID_DEFINE)
+
 DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0,
0x00, 
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
 
+#endif /* #if !defined(HXCOM_NO_IUNKNOWN_GUID_DEFINE) */
+
+#if !defined(HXCOM_NO_IMALLOC_GUID_DEFINE)
+
 DEFINE_GUID(IID_IMalloc, 00000002, 0x0000, 0x0000, 0xC0,
0x00, 
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+
+#endif /* #if !defined(HXCOM_NO_IMALLOC_GUID_DEFINE) */
+
 #endif
 
 #include <memory.h>		/* for memcmp */
 -722,7
+741,7 
 
 #define QILISTSIZE(x)	sizeof(x)/sizeof(QInterfaceList)
 
-#if !defined(INITGUID) || (defined(_STATICALLY_LINKED)
&& !defined(NCIHACK))
+#if !defined(INITGUID) || (defined(_STATICALLY_LINKED)
&& !defined(NCIHACK)) ||
defined(HXCOM_NO_QIFIND_DEFINE)
 EXTERN_C HX_RESULT QIFind(QInterfaceList* qiList, UINT32
ulqiListSize, 
 			  REFIID riid, void** ppvObj);
 #else	// !INITGUID || (_STATICALLY_LINKED &&
NCIHACK)
Index: hxnetapi.cpp
============================================================
=======
RCS file: /cvsroot/client/netwksvc/hxnetapi.cpp,v
retrieving revision 1.39
diff -u -w -r1.39 hxnetapi.cpp
--- hxnetapi.cpp	16 Aug 2006 17:50:57 -0000	1.39
+++ hxnetapi.cpp	23 Oct 2006 17:39:25 -0000
 -1069,7
+1069,15 
 
 STDMETHODIMP HXTCPSocket::GetLocalAddress(ULONG32&
lAddress)
 {
-    return HXR_NOTIMPL;
+    HX_RESULT retVal = HXR_FAIL;
+    
+    if(m_bConnected)
+    {
+        lAddress = (127 << 24) | 1;
+        retVal   = HXR_OK;
+    }
+
+    return retVal;
 }
 
 STDMETHODIMP HXTCPSocket::GetForeignAddress(ULONG32&
lAddress)
 -1084,7
+1092,15 
 
 STDMETHODIMP HXTCPSocket::GetLocalPort(UINT16& port)
 {
-    return HXR_NOTIMPL;
+    HX_RESULT retVal = HXR_FAIL;
+    
+    if (m_bConnected)
+    {
+        port   = m_nLocalPort;
+        retVal = HXR_OK;
+    }
+
+    return retVal;
 }
 
 STDMETHODIMP HXTCPSocket::GetForeignPort(UINT16& port)
 -1120,6
+1136,7 
     m_pCallback->m_pContext = this;
     m_pCtrl->set_callback(m_pCallback);
     m_lForeignAddress = DwToHost(m_pCtrl->get_addr());
+    m_nLocalPort = WToHost(m_pCtrl->get_local_port());
 
     m_bInitComplete = TRUE;
     m_bConnected = TRUE;
? fileformat/asfffdll_unix.pcf
? fileformat/asffflib_unix.pcf
Index: common/pub/hxccomptr.h
============================================================
=======
RCS file: /cvsroot/datatype/wm/common/pub/hxccomptr.h,v
retrieving revision 1.1
diff -u -w -r1.1 hxccomptr.h
--- common/pub/hxccomptr.h	9 Aug 2006 21:35:17 -0000	1.1
+++ common/pub/hxccomptr.h	23 Oct 2006 17:40:12 -0000
 -51,6
+51,8 
 #include "hxcom.h"
 #include "hxassert.h"
 
+template <class T>class HXCComPtr;
+
 inline IUnknown* HXComPtrAssign(IUnknown** pp, IUnknown*
lp)
 {
 	if (pp == NULL)
 -68,8
+70,8 
 class _NoAddRefReleaseOnHXCComPtr : public T
 {
 	private:
-		STDMETHOD_(ULONG, AddRef)()=0;
-		STDMETHOD_(ULONG, Release)()=0;
+		STDMETHOD_(ULONG32, AddRef)()=0;
+		STDMETHOD_(ULONG32, Release)()=0;
 };
 
 
Index: fileformat/asf_file_format_guids.cpp
============================================================
=======
RCS file:
/cvsroot/datatype/wm/fileformat/asf_file_format_guids.cpp,v
retrieving revision 1.4
diff -u -w -r1.4 asf_file_format_guids.cpp
--- fileformat/asf_file_format_guids.cpp	28 Sep 2006
20:38:53 -0000	1.4
+++ fileformat/asf_file_format_guids.cpp	23 Oct 2006
17:40:12 -0000
 -54,9
+54,9 
 #include "ihxfgbuf.h"
 #include "ihxtlogsystem.h"
 #include "ihxtlogsystemcontext.h"
-#include "inssbuffer.h"
 #include "hxdllaccess.h"
 #include "hxerror.h"
+#include "inssbuffer.h"
 #include "asf_guids.h"
 #if defined(HELIX_FEATURE_ASF_FILEFORMAT_WMFSDK)
 #include
"ihxwmreader.h"___________________________________
____________
Datatype-dev mailing list
Datatype-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
CR-Client: get WM-RTSP building/working on Linux (with diffs)
user name
 2006-10-23 19:04:49 
Eric Hyche wrote:
> [Making sure diff file is attached this time...]

Looks good.
--greg.

> 
> 
> 
> =====================================
> Eric Hyche, Technical Lead
> RealNetworks, Inc.
> ehychereal.com
> 
> 
>
------------------------------------------------------------
------------
> 
> _______________________________________________
> Common-dev mailing list
> Common-devhelixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/comm
on-dev

_______________________________________________
Datatype-dev mailing list
Datatype-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
CN-Client: get WM-RTSP building/working on Linux (withdiffs)
user name
 2006-10-23 20:19:00 
Checked into HEAD.

=============================================
Eric Hyche (ehychereal.com)
Technical Lead
RealNetworks, Inc.  

> -----Original Message-----
> From: client-dev-bounceshelixcommunity.org 
> [mailto:client-dev-bounceshelixcommunity.org] On
Behalf Of Eric Hyche
> Sent: Monday, October 23, 2006 2:49 PM
> To: common-devlists.helixcommunity.org; 
> datatype-devlists.helixcommunity.org; 
> client-devlists.helixcommunity.org
> Subject: [Client-dev] CR-Client: get WM-RTSP
building/working 
> on Linux (withdiffs)
> 
> 
> [Making sure diff file is attached this time...]
> 
> 
> 
> =====================================
> Eric Hyche, Technical Lead
> RealNetworks, Inc.
> ehychereal.com
> 


_______________________________________________
Datatype-dev mailing list
Datatype-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
[1-3]

about | contact  Other archives ( Real Estate discussion Medical topics )