Merge pull request sabrogden#1011 from sabrogden/ignore-formats

Support not saving clips because of the clipboard formats, ExcludeCli…

Author: sabrogden

src/CP_Main.cpp

@@ -174,6 +174,12 @@ CCP_MainApp::CCP_MainApp()
 	m_DittoFileData = ::RegisterClipboardFormat(_T("Ditto File Data"));
 	m_PNG_Format = GetFormatID(_T("PNG"));
 
+	//https://learn.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats
+	m_excludeClipboardContentFromMonitorProcessing = RegisterClipboardFormat(L"ExcludeClipboardContentFromMonitorProcessing");
+
+	//https://learn.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats
+	m_canIncludeInClipboardHistory = RegisterClipboardFormat(L"CanIncludeInClipboardHistory");
+
 	m_pNoDbMainFrame = NULL;
 	m_databaseOnNetworkShare = false;
 

src/CP_Main.h

@@ -164,6 +164,8 @@ class CCP_MainApp : public CWinApp
 	long	m_lLastGoodIndexForNextworkPassword;
 
 	CLIPFORMAT m_cfIgnoreClipboard; // used by CClip::LoadFromClipboard
+	CLIPFORMAT m_excludeClipboardContentFromMonitorProcessing;
+	CLIPFORMAT m_canIncludeInClipboardHistory;
 	CLIPFORMAT m_cfDelaySavingData;
 	CLIPFORMAT m_PingFormat;
 	CLIPFORMAT m_HTML_Format;

src/Clip.cpp

@@ -368,14 +368,21 @@ int CClip::LoadFromClipboard(CClipTypes* pClipTypes, bool checkClipboardIgnore,
 		return FALSE;
 	}
 
+	//https://learn.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats
+	if (::IsClipboardFormatAvailable(theApp.m_excludeClipboardContentFromMonitorProcessing))
+	{
+		Log(_T("ExcludeClipboardContentFromMonitorProcessing type is on the clipboard, skipping this clipboard change"));
+		return FALSE;
+	}
+
 	//If we are saving a multi paste then delay us connecting to the clipboard
 	//to allow the ctrl-v to do a paste
 	if(::IsClipboardFormatAvailable(theApp.m_cfDelaySavingData))
 	{
 		Log(_T("Delay clipboard type is on the clipboard, delaying 1500 ms to allow ctrl-v to work"));
 		Sleep(1500);
 	}
-		
+
 	//Attach to the clipboard
 	if(!oleData.AttachClipboard())
 	{
@@ -385,8 +392,36 @@ int CClip::LoadFromClipboard(CClipTypes* pClipTypes, bool checkClipboardIgnore,
 	}
 
 	oleData.EnsureClipboardObject();
-	
-	
+
+	//https://learn.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats
+	if (oleData.IsDataAvailable(theApp.m_canIncludeInClipboardHistory))
+	{
+		HGLOBAL includeInHistory = oleData.GetGlobalData(theApp.m_canIncludeInClipboardHistory);
+		if (includeInHistory != nullptr)
+		{
+			bool doReturn = false;
+
+			DWORD* data = static_cast<DWORD*>(GlobalLock(includeInHistory));
+			if (data != nullptr)
+			{			
+				if(*data == 0)
+				{
+					Log(_T("CanIncludeInClipboardHistory is 0, skipping this clipboard change"));
+					doReturn = true;
+				}
+
+				GlobalUnlock(includeInHistory);				
+			}
+
+			GlobalFree(includeInHistory);
+			if (doReturn)
+			{
+				oleData.Release();
+				return FALSE;
+			}
+		}
+	}
+		
 	m_Desc = "[Ditto Error] BAD DESCRIPTION";
 
 	// Get Description String

src/ClipboardViewer.cpp

@@ -246,6 +246,23 @@ LRESULT CClipboardViewer::OnClipboardChange(WPARAM wParam, LPARAM lPara)
 	return TRUE;
 }
 
+bool CClipboardViewer::GetIgnoreClipboardChange()
+{
+	if(::IsClipboardFormatAvailable(theApp.m_cfIgnoreClipboard))
+	{
+		Log(_T("Clipboard Viewer Ignore clipboard format is on the clipboard, ignoring change"));
+		return true;
+	}
+
+	//https://learn.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats
+	if (::IsClipboardFormatAvailable(theApp.m_excludeClipboardContentFromMonitorProcessing))
+	{
+		Log(_T("ExcludeClipboardContentFromMonitorProcessing clipboard format is on the clipboard, ignoring change"));
+		return true;
+	}
+	return false;
+}
+
 //Message that the clipboard data has changed
 void CClipboardViewer::OnDrawClipboard() 
 {
@@ -260,7 +277,7 @@ void CClipboardViewer::OnDrawClipboard()
 	{
 		if(m_bIsConnected)
 		{
-			if(!::IsClipboardFormatAvailable(theApp.m_cfIgnoreClipboard))
+			if(GetIgnoreClipboardChange() == false)
 			{
 				if(ValidActiveWnd())
 				{          
@@ -391,7 +408,7 @@ void CClipboardViewer::OnTimer(UINT_PTR nIDEvent)
 
 			if(dwNow - m_dwLastCopy > CGetSetOptions::m_dwSaveClipDelay || m_dwLastCopy > dwNow)
 			{
-				if(!::IsClipboardFormatAvailable(theApp.m_cfIgnoreClipboard))
+				if (GetIgnoreClipboardChange() == false)				
 				{
 					Log(StrF(_T("OnDrawClipboard::OnTimer %d"), dwNow));
 

src/ClipboardViewer.h

@@ -48,6 +48,8 @@ class CClipboardViewer : public CWnd
 	void SetEnsureConnectedTimer();
 	bool ValidActiveWnd();
 
+	bool GetIgnoreClipboardChange();
+
 	DWORD m_dwLastCopy;
 
 	// Generated message map functions