Update of /cvsroot/datatype/flash/flashhost
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv23987

Modified Files:
	flash_guest_player.cpp 
Log Message:
merge to head: add flash id to IHXUpgradeCollection if it fails to load.


Index: flash_guest_player.cpp
===================================================================
RCS file: /cvsroot/datatype/flash/flashhost/flash_guest_player.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- flash_guest_player.cpp	25 Apr 2008 22:58:36 -0000	1.51
+++ flash_guest_player.cpp	2 May 2008 00:48:48 -0000	1.52
@@ -86,6 +86,10 @@
 
 #include "xml_flash.h"
 
+#if defined(HELIX_FEATURE_AUTOUPGRADE)
+#include "hxupgrd.h"
+#endif // HELIX_FEATURE_AUTOUPGRADE
+
 const UINT32 dDefaultWindowWidth = 500;
 const UINT32 dDefaultWindowHeight = 500;
 
@@ -755,6 +759,27 @@
         }
     }
 
+#if defined(HELIX_FEATURE_AUTOUPGRADE)
+    if (retVal == HXR_MISSING_COMPONENTS && pContext)
+    {
+	// add flash plugin to the upgrade collection for au
+	IHXUpgradeCollection* pUpgradeCollection = NULL;
+	pContext->QueryInterface(IID_IHXUpgradeCollection, (void**) &pUpgradeCollection);
+	if (pUpgradeCollection)
+	{
+	    SPIHXCommonClassFactory spCCF = pContext;
+	    SPIHXBuffer spBuffer(spCCF.Ptr(), CLSID_IHXBuffer);
+	    if (spCCF && spBuffer.IsValid())
+	    {
+		char* pszPluginId = "flash";
+		spBuffer->Set((const unsigned char*)pszPluginId, strlen(pszPluginId)+1);
+		pUpgradeCollection->Add(eUT_Required, spBuffer.Ptr(), 0, 0);
+	    }
+	    HX_RELEASE(pUpgradeCollection);
+	}
+    }
+#endif // HELIX_FEATURE_AUTOUPGRADE
+
     return retVal;
 }