Merge branch 'dev/3.7.1' of github.com:AgoraIO/API-Examples into dev/3.7.1

Author: zhaoyongqiang

windows/APIExample/APIExample/APIExample.vcxproj

@@ -29,14 +29,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
@@ -51,7 +51,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>

windows/APIExample/APIExample/Advanced/MultiVideoSource/CAgoraMutilVideoSourceDlg.cpp

@@ -371,7 +371,7 @@ void CAgoraMutilVideoSourceDlg::StartShare()
 	HWND hMarkWnd = NULL;
 
 	if (m_cmbShare.GetCurSel() > 0) {
-		hMarkWnd = m_listWnd.GetAt(m_listWnd.FindIndex(m_cmbShare.GetCurSel() + 1));
+		hMarkWnd = m_listWnd.GetAt(m_listWnd.FindIndex(m_cmbShare.GetCurSel() - 1));
 	}
 
 	if (!hMarkWnd || ::IsWindow(hMarkWnd)) {

windows/APIExample/APIExample/Advanced/MultiVideoSource/ProcessScreenShare/ProcessScreenShare.vcxproj

@@ -28,29 +28,29 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>

windows/APIExample/APIExample/Advanced/MultiVideoSource/ProcessScreenShare/ProcessScreenShareDlg.cpp

@@ -245,7 +245,7 @@ BOOL CProcessScreenShareDlg::EnableScreenCapture(HWND hWnd, int nCapFPS, LPCRECT
 				::GetWindowRect(hWnd, &rc);
 				capParam.dimensions.width = rc.right - rc.left;
 				capParam.dimensions.height = rc.bottom - rc.top;
-				rcCap = { rc.left, rc.top, rc.right, rc.bottom };
+				rcCap = { 0 ,0,0,0 };
 				ret = m_lpRtcEngine->startScreenCaptureByWindowId(hWnd, rcCap, capParam);
 			}
 			else {

windows/APIExample/APIExample/Advanced/VideoMetadata/CAgoraMetaDataDlg.cpp

@@ -379,12 +379,12 @@ LRESULT CAgoraMetaDataDlg::OnEIDUserJoined(WPARAM wParam, LPARAM lParam)
     strInfo.Format(_T("%u joined"), wParam);
     m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
 
-  /*  VideoCanvas canvas;
-    canvas.uid = wParam;
-    canvas.view = m_remoteVideoWnd.GetSafeHwnd();
-    canvas.renderMode = RENDER_MODE_FIT;
-    m_rtcEngine->setupRemoteVideo(canvas);*/
-    return 0;
+	VideoCanvas canvas;
+	canvas.uid = wParam;
+	canvas.view = m_remoteVideoWnd.GetSafeHwnd();
+	canvas.renderMode = RENDER_MODE_FIT;
+	m_rtcEngine->setupRemoteVideo(canvas);
+	return 0;
 }
 
 //EID_USER_OFFLINE message window handler.