MS-26514 MS-26529

Author: sbd021

windows/APIExample/APIExample/Advanced/AudioEffect/CAgoraEffectDlg.cpp

@@ -55,6 +55,8 @@ void CAgoraEffectDlg::DoDataExchange(CDataExchange* pDX)
 
 
 BEGIN_MESSAGE_MAP(CAgoraEffectDlg, CDialogEx)
+	ON_MESSAGE(WM_MSGID(EID_LEAVE_CHANNEL), &CAgoraEffectDlg::OnEIDLeaveChannel)
+	ON_MESSAGE(WM_MSGID(EID_JOINCHANNEL_SUCCESS), &CAgoraEffectDlg::OnEIDJoinChannelSuccess)
 	ON_BN_CLICKED(IDC_BUTTON_JOINCHANNEL, &CAgoraEffectDlg::OnBnClickedButtonJoinchannel)
 	ON_BN_CLICKED(IDC_BUTTON_ADD_EFFECT, &CAgoraEffectDlg::OnBnClickedButtonAddEffect)
 	ON_BN_CLICKED(IDC_BUTTON_PRELOAD, &CAgoraEffectDlg::OnBnClickedButtonPreload)
@@ -504,13 +506,10 @@ BOOL CAgoraEffectDlg::PreTranslateMessage(MSG* pMsg)
 	return CDialogEx::PreTranslateMessage(pMsg);
 }
 
-
-
-
-
 //EID_JOINCHANNEL_SUCCESS message window handler
 LRESULT CAgoraEffectDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam)
 {
+	m_btnJoinChannel.EnableWindow(TRUE);
 	m_joinChannel = true;
 	m_btnJoinChannel.SetWindowText(commonCtrlLeaveChannel);
 	m_btnJoinChannel.EnableWindow(TRUE);
@@ -526,6 +525,7 @@ LRESULT CAgoraEffectDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam)
 //EID_LEAVEHANNEL_SUCCESS message window handler
 LRESULT CAgoraEffectDlg::OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam)
 {
+	m_btnJoinChannel.EnableWindow(TRUE);
 	m_joinChannel = false;
 	m_btnJoinChannel.SetWindowText(commonCtrlJoinChannel);
 	CString strInfo;

windows/APIExample/APIExample/Advanced/CustomVideoCapture/CAgoraCaptureVideoDlg.cpp

@@ -70,6 +70,9 @@ bool CAgoraCaptureVideoDlg::InitAgora()
 */
 void CAgoraCaptureVideoDlg::UnInitAgora()
 {
+	m_cmbVideoDevice.EnableWindow(TRUE);
+	m_cmbVideoType.EnableWindow(TRUE);
+	m_btnSetExtCapture.EnableWindow(TRUE);
 	if (m_rtcEngine) {
 		if (m_joinChannel)
 			m_joinChannel = !m_rtcEngine->leaveChannel();
@@ -371,6 +374,9 @@ void CAgoraCaptureVideoDlg::OnClickedButtonJoinchannel()
 //EID_JOINCHANNEL_SUCCESS message window handler.
 LRESULT CAgoraCaptureVideoDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam)
 {
+	m_cmbVideoDevice.EnableWindow(FALSE);
+	m_cmbVideoType.EnableWindow(FALSE);
+	m_btnSetExtCapture.EnableWindow(FALSE);
 	m_joinChannel = true;
 	m_btnJoinChannel.EnableWindow(TRUE);
 	m_btnJoinChannel.SetWindowText(commonCtrlLeaveChannel);
@@ -388,7 +394,9 @@ LRESULT CAgoraCaptureVideoDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lPa
 //EID_LEAVE_CHANNEL message window handler.
 LRESULT CAgoraCaptureVideoDlg::OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam)
 {
-
+	m_cmbVideoDevice.EnableWindow(TRUE);
+	m_cmbVideoType.EnableWindow(TRUE);
+	m_btnSetExtCapture.EnableWindow(TRUE);
 	m_joinChannel = false;
 	m_btnJoinChannel.SetWindowText(commonCtrlJoinChannel);
 

windows/APIExample/APIExample/Advanced/MediaIOCustomVideoCaptrue/CAgoraMediaIOVideoCaptureDlg.cpp

@@ -69,6 +69,9 @@ bool CAgoraMediaIOVideoCaptureDlg::InitAgora()
 */
 void CAgoraMediaIOVideoCaptureDlg::UnInitAgora()
 {
+	m_cmbVideoDevice.EnableWindow(TRUE);
+	m_cmbVideoType.EnableWindow(TRUE);
+	m_btnSetExtCapture.EnableWindow(TRUE);
 	if (m_rtcEngine) {
 		if (m_joinChannel)
 			m_joinChannel = !m_rtcEngine->leaveChannel();
@@ -323,6 +326,9 @@ void CAgoraMediaIOVideoCaptureDlg::OnClickedButtonJoinchannel()
 //EID_JOINCHANNEL_SUCCESS message window handler.
 LRESULT CAgoraMediaIOVideoCaptureDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam)
 {
+	m_cmbVideoDevice.EnableWindow(FALSE);
+	m_cmbVideoType.EnableWindow(FALSE);
+	m_btnSetExtCapture.EnableWindow(FALSE);
 	m_joinChannel = true;
 	m_btnJoinChannel.EnableWindow(TRUE);
 	m_btnJoinChannel.SetWindowText(commonCtrlLeaveChannel);
@@ -340,7 +346,9 @@ LRESULT CAgoraMediaIOVideoCaptureDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPA
 //EID_LEAVE_CHANNEL message window handler.
 LRESULT CAgoraMediaIOVideoCaptureDlg::OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam)
 {
-
+	m_cmbVideoDevice.EnableWindow(TRUE);
+	m_cmbVideoType.EnableWindow(TRUE);
+	m_btnSetExtCapture.EnableWindow(TRUE);
 	m_joinChannel = false;
 	m_btnJoinChannel.SetWindowText(commonCtrlJoinChannel);
 

windows/APIExample/APIExample/Advanced/ScreenShare/AgoraScreenCapture.cpp

@@ -864,7 +864,10 @@ void CAgoraScreenCapture::OnBnClickedButtonStartShareScreen()
 
         m_monitors.GetScreenRect();
         ScreenCaptureParameters capParam;
-
+		if (regionRect.x < 0 || regionRect.y < 0) {
+			AfxMessageBox(_T("select hwnd rect has minus location"));
+			return;
+		}
         m_rtcEngine->startScreenCaptureByScreenRect(screenRegion, regionRect, capParam);
 		m_btnShareScreen.SetWindowText(screenShareCtrlStopShare);