From 75df6873fadddf89fcea4ce26d4147a95177f819 Mon Sep 17 00:00:00 2001
From: "sarandogou0@gmail.com" <sarandogou0@gmail.com>
Date: Sat, 31 Jan 2015 00:31:15 +0100
Subject: [PATCH] Release 1.2.2 Fix issue #18 Fix issue #19

---
 common/_Config.h                          |   2 +-
 common/webrtc-everywhere-common.rc        | Bin 6920 -> 6920 bytes
 ie/WebRTC.cc                              |  51 ++++++++++++++--------
 ie/WebRTC.h                               |   6 ++-
 ie/webrtc-everywhere.aps                  | Bin 16232 -> 16136 bytes
 ie/webrtc-everywhere.rc                   |   8 ++--
 npapi/Release/webrtc-everywhere-npapi.res | Bin 1060 -> 1060 bytes
 npapi/Utils.cc                            |   2 +-
 npapi/webrtc-everywhere-npapi.rc          |   8 ++--
 wininstall/innosetup.iss                  |   2 +-
 10 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/common/_Config.h b/common/_Config.h
index d590cfd..6cfbd3f 100755
--- 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
index 66d282b2a9e04c1bf1e9b8fe67f503e23d03db8d..0f85aa7839dc157961ef88a33fce98b5033a7525 100755
GIT binary patch
delta 34
ncmeA$>oD6;!@+1Yxt7C_(P;B}4n}4mwUIlX2}lX@edhrHv`q=w

delta 34
ncmeA$>oD6;!@+1cxt7C_(Qxy64n}4mwUIlX2}lX@edhrHv<wN=

diff --git a/ie/WebRTC.cc b/ie/WebRTC.cc
index 37b3574..03ed253 100755
--- a/ie/WebRTC.cc
+++ b/ie/WebRTC.cc
@@ -74,12 +74,35 @@ 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
@@ -87,27 +110,17 @@ STDMETHODIMP CWebRTC::SetClientSite(_Inout_opt_ IOleClientSite *pClientSite)
 		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
index b482857..7188a7c 100755
--- 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
index e5d8e7843c853d746e4d071cc3d35d843d08232f..f1ae0f670266c5dfaf4bca56a3794cdb7f658a23 100755
GIT binary patch
delta 1795
zcmZ{kOH3PA6o$`?VR(6J@C#$GJv^K^B0$C^U<X<l?BNk%1NMZ_swrw3NTX6fs8xts
zk*4jUj|4(a8?k88Rn<)uDRLGp5~OxTtE6HPsa0E{F1ldJqN<Qug`RuI4mhHB<eB@Q
z@0|b6eR#GOK3=#Ux2#72uavY~0Lt(Odo4aWVaJGlOIX2LM}Y2{qoqUyfi3_MFFERk
z9lS;N$M~J2($Yp%zd3x>X?P9h=r;}LU<S_9?;XkqSb+#0b_Oq>h6y+eDKH=g3e3V3
z@$+zj@)ek*>^XWek4f%x0gjR$0G&T$@CNZ2c#Aw(e2D5N_-IOYL<M@uYmTDKYo5kE
z2F3KoEILKeQCxDmgfM>XY-tI>>u`iz!jz*zD>P+$$Fpzn%q-C2QY|T{!gg1etBL$3
zpqb`4MHg!?6Zz29cK~5EKf8Rk{F&>x9CgSF4DYP~R=b;oaAv^$jhq>d6brar9~1zm
zL+zPFLqy1S9|SvdUG*^QW~M_k?6G;|A_KR>k<4OaM=nQb>d$qrH1qVemN!{sttFB<
ztFpYz?eM#~oRL<Zvv{0aK50t{I2JwU^U<kjpjr0AY3QNn?(RC9G_9PqKwQ4HiQn6t
zq73-Etx9|j@E@CZ#0D@BPmQOCPNib{K(coTR8@s?Gn&xj1Dc7_hGyt#f?=rG4~>+r
zCG=4}X%KrJ?0|kbAgO9AH~_yY_gr?G*(oE&ESN(ZxSq!1Mxr;ZC*yjGKs&hefH9QR
zWBppPPtOeyfy%uM&CnQ4>Vs4p1&>J*dOEE=tq9j0gQ|l{vW{UDytrHu5ER^~P=s2%
zTjBTD0gP+I>G7mKW{js_qE#3l)do-LpoYUxkADj(akUUnie9_OmzOQH*{lWlUg=or
zKKZzG9vdvq%=@BOK&43G;*Mp`;wvkDcC&um+pNr)qB|mvSbg|GNt^Tu?dt9>PFria
z{M3|7);cafGv!@t4VPC<`N&$&<uy}oXOkCAX_p&0T{7hhvclzcQ=XB%TrQjPq8#Az
zhAD5#AuiFBYuVb*O}Q!iIsL+v|H?rog_|gqri2=N5Ung=#}R*t9xW`R3E#s<b{~Dk
z+`?bHH)(eiQg~j#pX|-j3Z3Zt0xop;#g7Vc!{Ww!9Uie;;@#Owr?gF5uwKIDj@K!z
zlH9U#>G3<IUrBD*n7mQzl(xwCp&gsMyi%6{@TY_4SsO|!=!N*&(=A5Ca1rs~La=B*
zi4$3O^P25Lc{MK*>GUw-oyq#JIp!>N!rxYLJbM6Uz75sfcd#+fH$h~j2FnXQbhugD
z@7hDq<L71F&3R>=M6L$-cyF6^d4(F`9Xju{n2MTLc#_Ce9hOV~H{Mn~FDq}&E9<7R
zSAu*z_AO^^|BLn!et3xEOD4_3JrrvV;j2-v#J*o&hOqR6Us|O@@JAyiMZd)UDEC$D
HE%N^d*a4Lg

delta 2386
zcmaKue@t6d6vxkdZ5eDZ7?ie@U**>*6iQ!9Y0DT;Uf;@_(1-6m1~VpX5tnS)25wB5
zPKb$rESu4}qlucRS)yTo=pRe}F$*qBG{*m?hQt`n{_>B-#Q9_K4-=Dl?tQ=>tXWBK
z?>V3Ex%b?2Z|>#d(!HfC8OLf0@UM8n32;romxF!*@ZI2D{G+p8sKl~RK&ZlSs6lY!
zc&Nr1NkTQA2<hUQ6K{q5_{(5%{_C!=fET*m`Mu#Y4*a`2AU+WB1Id4Ns5rkWt%&$a
zYP|Ia0BEJ}C``c!{XTryBhU{-DoSZ)>w~|Arg5xm@dPu!61N9*Zw3(JA5)n&)to#w
znNdIju$$4XW(+{;Bh4XW=8&Qrs+OBka|bj)E!vEqM|~*7TJdPC9&g41^}3Q(4O2f1
z5-nHF=riL=Mop7PNsj}r_BLTnyt(d?N|LzB&?a?Rv4*`9Z^3Y1GrrLm3fP2kF4Rrg
zFw>@?D-)V-QVt0}ewt{!nhfG>GJv;}4d_p`Ek|koC<TnnOerH21AUO7WnXt}FHHEc
z!n9GC_7ts`$o3_ZQy{;SByu_@D`OC4GBuMPVcEniLsynr1$r$@&E_;+fw*NIRt(C8
z$K*81iTC6&%}^j|8KcVB1f;CKF*BiS2XpCh+M`GW$SFV#O{cFfOQ8)pJT<D&_)>&+
zk#QICj?HzmGH|!g7Di&)R3<LMvY79P6zR3h9bA-AWmB6lX`>BN#w}FL(S)MtvX;v!
zGQ&jsELy^8E`3PNrcF(sG!&h0JSnK|_(F$A5!rk@xsEnOl@+RBhAL;W+*82uE{<(S
z#?;d??S&Mvcq!iQaA&!+%qHcBhaC$lt|Ub*?QWZZA3rKq&LkeQcsZ7LwhZvGDmJpR
zA1z6WTf#kCC=JkO`77~8qH3okB`mWFOOthECN0yA^GWw!Nm^f7^?Ejjk<KdXnMBuD
z<-t3h^+h}rFXlqEbc_7n*+?zBJAmCIm2`IL$jz|)R2jPI9Nt)J5QJ&`P-vv~OQEO4
z+6WTjKSGP}1=ffy!aKNM^g0gGy)z}&_n4qThQ9p}fB}$U4o<;59EH<xo;;_icM6_|
zL4G|v12y=T*d}d_IRMAuBxwRLOYK>B4$hEg9u}ybqY)?;n;h*z1XV}RmidCD?RfIM
zxZ;o;W8lG`9YbYdn&Bk<(N#pA9%t6(Ve7f<tZ(0%+XUq@M^Wc!rUm<Y@JDC25Xrk-
zD`mnEmicP&yQ&hQ0&jT|`91EWu-<*GdVsq5Tb{EUp5wkv_*2dBhWF`Ou6wg?naOuI
zaQXc}GJmr%#ys}}n*+SxoME23Et{H4ZHbL>{@q(E<Ugw{7SJ7>t-I*jelu-c)Kt=6
zQ(dlW0>CHuYS6oz?+-O=borkY@teVhq6Z|N-GLuT9(p*I*?Vze=ab(H_Cze~vTGiH
zBG_&DEKT?5-Ff`Bq#+<l$I}D_rm0mShnM@yG1~7D7b|h8zYdR4_dnJR@0z9&hpX5N
zR`K@7)#4?<!2v(cyWB;SL|*q|Mc9K~MQ+!hlwK)*Kj6jDeLkTJrTt!9+~*VBO<b~C
z?k*alf&^O0^m(m{*q=k0;1z5d^x|-J$sXG~nIYh8XM^}pTVY_28zj6K<an+CRtVqg
z;CQ|OW`iFIF^m<pTc#Z+vev}|&lCt8A#8>@K3f0}5dOA@<Ank^O}JO$_*?;eknr^=
z$1fJZZ0^=xj$bN(hY7zI=XkLI&Jr$8Fx-E>0KP}Q`6SzLk-o>cA_66w|F(>fXEBBT
Gp#Oj7G{BSq

diff --git a/ie/webrtc-everywhere.rc b/ie/webrtc-everywhere.rc
index 1618c66..a21fe9a 100755
--- 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
index ef5afc52cad16d13a24a045a183a3315da853228..cf7ab83793a56924450e7970d1113119e4b7a722 100755
GIT binary patch
delta 33
pcmZ3&v4mqn2`3W+0|OHSBLmaM+Hgijqs><t*_jxPCf{Xt2LO9J2c-Z2

delta 33
pcmZ3&v4mqn2`3{10|OHSBLm~c+Hgij!_8M2*_jv(C*Ngu2LO8h2cZA}

diff --git a/npapi/Utils.cc b/npapi/Utils.cc
index 252634f..bf01e92 100755
--- 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
index 4dc273c..bdd4895 100755
--- 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
index 2922a45..ae184b5 100755
--- 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/"