[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] flash/flashhost/pub/platform/win32 flash.tli, 1.2,
From:       ehyche () helixcommunity ! org
Date:       2007-04-27 0:56:26
Message-ID: 200704270056.l3R0uZc7011310 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/flash/flashhost/pub/platform/win32
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25604/pub/platform/win32

Modified Files:
      Tag: hxclient_2_0_4_cayenne
	flash.tli flash_guest_player_ax.h 
Log Message:
Merge from HEAD.

Description
------------------------------------------
In the ActiveX-based Flash guest player, we use an ATL-generated
wrapper around the ActiveX control. The ATL wrapper throws
exceptions when calls to the ActiveX fail. But we generally
don't handle exceptions in Helix code. Therefore, 
the change first disables the call which would trigger
exceptions in the ATL wrapper (_com_issue_errorex) by
replacing it with our own null version.

Secondly, this change checks the Flash player version
and does not call methods which are not supported
by that version of the player. Practically, this
just affects a few calls (CallFunction() and DisableLocalSecurity()).

Also, the call to GetAllowNetworking() was removed, since
the result was not used anywhere.

Files Modified
------------------------------------------
datatype/flash/flashhost/platform/win32/flash_guest_player_ax.cpp
datatype/flash/flashhost/pub/platform/win32/flash.tli
datatype/flash/flashhost/pub/platform/win32/flash_guest_player_ax.h

Branches
------------------------------------------
HEAD, 150Cay, 204Cay

Testing
------------------------------------------
Smoke-tested transcoding and .swf playback after this change





Index: flash.tli
===================================================================
RCS file: /cvsroot/datatype/flash/flashhost/pub/platform/win32/flash.tli,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -d -r1.2 -r1.2.8.1
--- flash.tli	31 Jan 2007 20:19:15 -0000	1.2
+++ flash.tli	27 Apr 2007 00:56:23 -0000	1.2.8.1
@@ -11,6 +11,12 @@
 // interface IShockwaveFlash wrapper method implementations
 //
 
+// XXXMEH - prevent these methods from throwing exceptions
+// by redefining _com_issue_errorex to be a null function
+inline void my_com_issue_errorex(HRESULT hr, IUnknown* pUnk, REFIID riid) {}
+
+#define _com_issue_errorex my_com_issue_errorex
+
 inline long IShockwaveFlash::GetReadyState ( ) {
     long _result = 0;
     HRESULT _hr = get_ReadyState(&_result);

Index: flash_guest_player_ax.h
===================================================================
RCS file: /cvsroot/datatype/flash/flashhost/pub/platform/win32/flash_guest_player_ax.h,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.2.2.1
diff -u -d -r1.6.2.2 -r1.6.2.2.2.1
--- flash_guest_player_ax.h	23 Apr 2007 17:18:14 -0000	1.6.2.2
+++ flash_guest_player_ax.h	27 Apr 2007 00:56:23 -0000	1.6.2.2.2.1
@@ -319,6 +319,7 @@
     IHXFileObject* m_pFileObject;
     double         m_dFrameRate;
     HXBOOL         m_bInPlaceActive;
+    INT32          m_lFlashVersion;
 };
 
 #endif /* #ifndef FLASH_GUEST_PLAYER_AX_H */


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]