Release 1.2.2

Fix issue #18 Fix issue #19
sarandogou · Jan 30, 2015 · 75df687 · 75df687
1 parent e1dd1d1
commit 75df687
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 32 deletions.
diff --git a/common/_Config.h b/common/_Config.h
@@ -18,7 +18,7 @@
 #	define kPluginVersionMinor 2
 #endif
 #if !defined(kPluginVersionMicro)
-#	define kPluginVersionMicro 1
+#	define kPluginVersionMicro 2
 #endif
 #if !defined(kPluginVersionString)
 #	define kPluginVersionString WE_STRING(WE_CAT(kPluginVersionMajor, .)) WE_STRING(WE_CAT(kPluginVersionMinor, .)) WE_STRING(kPluginVersionMicro)

diff --git a/common/webrtc-everywhere-common.rc b/common/webrtc-everywhere-common.rc
diff --git a/ie/WebRTC.cc b/ie/WebRTC.cc
@@ -74,40 +74,53 @@ void CWebRTC::FinalRelease()
 	ReleaseFakePeerConnectionFactory();
 }
 
-#if 0
+HRESULT CWebRTC::QueryWindow()
+{
+	if (m_spWindow) {
+		return S_OK;
+	}
+	else if (m_spClientSite) {
+		m_spContainer = NULL;
+		m_spDoc = NULL;
+		HRESULT hr = m_spClientSite->GetContainer(&m_spContainer);
+		if (SUCCEEDED(hr)) {
+			hr = m_spContainer->QueryInterface(IID_PPV_ARGS(&m_spDoc));
+			if (SUCCEEDED(hr)) {
+				hr = m_spDoc->get_parentWindow(&m_spWindow);
+				if (SUCCEEDED(hr)) {
+					hr = m_spWindow->get_location(&m_spLocation);
+				}
+			}
+		}
+		return hr;
+	}
+	return E_UNEXPECTED;
+}
+
 // IOleObjectImpl::SetClientSite()
 STDMETHODIMP CWebRTC::SetClientSite(_Inout_opt_ IOleClientSite *pClientSite)
 {
 	HRESULT hr = IOleObjectImpl::SetClientSite(pClientSite); // call base function
 	if (SUCCEEDED(hr) && m_spClientSite) {
+#if 0
 		HRESULT _hr = m_spClientSite->QueryInterface(IID_PPV_ARGS(&m_spPresentSite));
 		if (FAILED(_hr)) {
 			// IViewObjectPresentSite only supported on IE9 and later
 		}
 		else {
 			/*hr = */m_spPresentSite->SetCompositionMode(VIEW_OBJECT_COMPOSITION_MODE_SURFACEPRESENTER);
 		}
+#endif
 
-		HRESULT hr = S_OK;
-
-		_hr = m_spClientSite->GetContainer(&m_spContainer);
-		if (SUCCEEDED(_hr)) {
-			_hr = m_spContainer->QueryInterface(IID_PPV_ARGS(&m_spDoc));
-			if (SUCCEEDED(_hr)) {
-				_hr = m_spDoc->get_parentWindow(&m_spWindow);
-				if (SUCCEEDED(_hr)) {
-					_hr = m_spWindow->get_location(&m_spLocation);
-				}
-			}
-		}
-
-		if (m_spWindow) {
-			_hr = Utils::InstallScripts(m_spWindow);
+		if (SUCCEEDED(QueryWindow())) {
+			hr = Utils::InstallScripts(m_spWindow);
 		}
 	}
 	return hr;
 }
 
+#if 0
+
 // IPersistPropertyBagImpl::Load
 STDMETHODIMP CWebRTC::Load(__RPC__in_opt IPropertyBag *pPropBag, __RPC__in_opt IErrorLog *pErrorLog)
 {
@@ -289,7 +302,7 @@ STDMETHODIMP CWebRTC::createDisplay(__out IDispatch** ppDisplay)
 STDMETHODIMP CWebRTC::getUserMedia(VARIANT constraints, VARIANT successCallback, VARIANT errorCallback)
 {
 	HRESULT hr = S_OK;
-
+	
 	CComPtr<IDispatch>_constraints = Utils::VariantToDispatch(constraints);
 	CComPtr<IDispatch>_successCallback = Utils::VariantToDispatch(successCallback);
 	CComPtr<IDispatch>_errorCallback = Utils::VariantToDispatch(errorCallback);
@@ -619,7 +632,7 @@ STDMETHODIMP CWebRTC::get_isWebRtcPlugin(__out VARIANT_BOOL* pVal)
 HRESULT CWebRTC::GetDispatch(CComPtr<IDispatch> &spDispatch)
 {
 	if (!m_spWindow) {
-		CHECK_HR_RETURN(E_POINTER);
+		CHECK_HR_RETURN(QueryWindow());
 	}
 
 	CHECK_HR_RETURN(m_spWindow->QueryInterface(IID_PPV_ARGS(&spDispatch)));
@@ -629,7 +642,7 @@ HRESULT CWebRTC::GetDispatch(CComPtr<IDispatch> &spDispatch)
 HRESULT CWebRTC::GetHTMLWindow2(CComPtr<IHTMLWindow2> &spWindow2)
 {
 	if (!m_spWindow) {
-		CHECK_HR_RETURN(E_POINTER);
+		CHECK_HR_RETURN(QueryWindow());
 	}
 	spWindow2 = m_spWindow;
 	return S_OK;

diff --git a/ie/WebRTC.h b/ie/WebRTC.h
@@ -209,10 +209,9 @@ class ATL_NO_VTABLE CWebRTC :
 	STDMETHOD(get_videoHeight)(__out LONG* pVal);
 	STDMETHOD(get_isWebRtcPlugin)(__out VARIANT_BOOL* pVal);
 
-#if 0
 	// IOleObjectImpl::SetClientSite()
 	STDMETHOD(SetClientSite)(_Inout_opt_ IOleClientSite *pClientSite);
-
+#if 0
 	// IPersistPropertyBagImpl::Load
 	STDMETHOD(Load)(__RPC__in_opt IPropertyBag *pPropBag, __RPC__in_opt IErrorLog *pErrorLog);
 
@@ -231,6 +230,9 @@ class ATL_NO_VTABLE CWebRTC :
 	HRESULT GetDispatch(CComPtr<IDispatch> &spDispatch);
 	HRESULT GetHTMLWindow2(CComPtr<IHTMLWindow2> &spWindow2);
 
+	private:
+		HRESULT QueryWindow();
+
 	private:
 		_Buffer *m_pTempVideoBuff;
 		std::vector<CComPtr<IDispatch>>m_callbacks_onplay;

diff --git a/ie/webrtc-everywhere.aps b/ie/webrtc-everywhere.aps
diff --git a/ie/webrtc-everywhere.rc b/ie/webrtc-everywhere.rc
@@ -57,8 +57,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,1
- PRODUCTVERSION 1,2,0,1
+ FILEVERSION 1,2,0,2
+ PRODUCTVERSION 1,2,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -75,12 +75,12 @@ BEGIN
         BEGIN
 			VALUE "CompanyName", "Sarandogou"
 			VALUE "FileDescription", "WebRTC plugin for Safari, IE, Chrome, Opera and Firefox"
-			VALUE "FileVersion", "1.2.0.1"
+			VALUE "FileVersion", "1.2.0.2"
 			VALUE "LegalCopyright", "(c) 2014-2015 Sarandogou.  All rights reserved."
             VALUE "InternalName", "webrtc-everywhere-ie.dll"
             VALUE "OriginalFilename", "webrtc-everywhere-ie.dll"
 			VALUE "ProductName", "WebRTC Everywhere Plugin"
-			VALUE "ProductVersion", "1.2.0.1"
+			VALUE "ProductVersion", "1.2.0.2"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/npapi/Release/webrtc-everywhere-npapi.res b/npapi/Release/webrtc-everywhere-npapi.res
diff --git a/npapi/Utils.cc b/npapi/Utils.cc
@@ -760,7 +760,7 @@ NPError Utils::InstallScripts(NPP npp)
 
 	for (size_t i = 0; i < sizeof(__scripts) / sizeof(__scripts[0]); ++i) {
         npScript.UTF8Characters = __scripts[i].code;
-        npScript.UTF8Length = we_strlen(npScript.UTF8Characters);
+        npScript.UTF8Length = (uint32_t)we_strlen(npScript.UTF8Characters);
         if (!BrowserFuncs->evaluate(npp, npWindow, &npScript, &var)) {
             CHECK_NPERR_BAIL(err = NPERR_GENERIC_ERROR);
         }

diff --git a/npapi/webrtc-everywhere-npapi.rc b/npapi/webrtc-everywhere-npapi.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,1
- PRODUCTVERSION 1,2,0,1
+ FILEVERSION 1,2,0,2
+ PRODUCTVERSION 1,2,0,2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,13 +71,13 @@ BEGIN
         BEGIN
 			VALUE "CompanyName", "Sarandogou"
             VALUE "FileDescription", "WebRTC plugin for Safari, IE, Chrome, Opera and Firefox"
-            VALUE "FileVersion", "1.2.0.1"
+            VALUE "FileVersion", "1.2.0.2"
             VALUE "InternalName", "npwebrtc-everywhere.dll"
             VALUE "LegalCopyright", "(c) 2014-2015 Sarandogou.  All rights reserved."
             VALUE "MIMEType", "application/webrtc-everywhere"
             VALUE "OriginalFilename", "npwebrtc-everywhere.dll"
             VALUE "ProductName", "WebRTC Everywhere Plugin"
-            VALUE "ProductVersion", "1.2.0.1"
+            VALUE "ProductVersion", "1.2.0.2"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/wininstall/innosetup.iss b/wininstall/innosetup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "webrtc-everywhere"
-#define MyAppVersion "1.2.0.1"
+#define MyAppVersion "1.2.0.2"
 #define MyAppPublisher "Sarandogou"
 #define MyAppURL "https://ns313841.ovh.net/webrtc/"