NOT PART OF BUILD. Minor tweaks to control site classes to fix problems exposed by random activex controls running in the plugin.

embedding/browser/activex/src/control/ControlSite.cpp

@@ -415,6 +415,15 @@ void CControlSite::SetAmbientUserMode(BOOL bUserMode)
 }
 
 
+///////////////////////////////////////////////////////////////////////////////
+// IServiceProvider implementation
+
+HRESULT STDMETHODCALLTYPE CControlSite::QueryService(REFGUID guidService, REFIID riid, void** ppv)
+{
+    return E_NOINTERFACE;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // IDispatch implementation
 
@@ -823,7 +832,6 @@ HRESULT STDMETHODCALLTYPE CControlSite::GetDC(/* [in] */ LPCRECT pRect, /* [in]
 HRESULT STDMETHODCALLTYPE CControlSite::ReleaseDC(/* [in] */ HDC hDC)
 {
     // Release the DC
-    NG_ASSERT(hDC);
     if (hDC == NULL || hDC != m_hDCBuffer)
     {
         return E_INVALIDARG;

embedding/browser/activex/src/control/ControlSite.h

@@ -56,7 +56,8 @@
     COM_INTERFACE_ENTRY_IID(IID_IAdviseSink, IAdviseSinkEx) \
     COM_INTERFACE_ENTRY_IID(IID_IAdviseSink2, IAdviseSinkEx) \
     COM_INTERFACE_ENTRY_IID(IID_IAdviseSinkEx, IAdviseSinkEx) \
-    COM_INTERFACE_ENTRY(IOleCommandTarget)
+    COM_INTERFACE_ENTRY(IOleCommandTarget) \
+    COM_INTERFACE_ENTRY(IServiceProvider)
 
 
 //
@@ -88,6 +89,7 @@ class CControlSite :    public CComObjectRootEx<CComSingleThreadModel>,
                         public IOleControlSite,
                         public IAdviseSinkEx,
                         public IDispatch,
+                        public IServiceProvider,
                         public IOleCommandTargetImpl<CControlSite>
 {
 protected:
@@ -241,6 +243,9 @@ END_OLECOMMAND_TABLE()
         return m_bInPlaceActive;
     }
 
+// IServiceProvider
+    virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void** ppv);
+
 // IDispatch
     virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(/* [out] */ UINT __RPC_FAR *pctinfo);
     virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(/* [in] */ UINT iTInfo, /* [in] */ LCID lcid, /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);