Updated windows implementatin

Res changes now implemented

Author: smasherprog

Example/Screen_Capture_Example.cpp

@@ -59,7 +59,7 @@ int main()
 
 		Copy(*imagewrapper[Index(monitor)], img);
 
-		tje_encode_to_file(s.c_str(), Width(*imagewrapper[Index(monitor)]), Height(*imagewrapper[Index(monitor)]), 4, (const unsigned char*)images[Index(monitor)].get());
+		//tje_encode_to_file(s.c_str(), Width(*imagewrapper[Index(monitor)]), Height(*imagewrapper[Index(monitor)]), 4, (const unsigned char*)images[Index(monitor)].get());
 
 	};
 	auto mousefunc = [&](const SL::Screen_Capture::Image* img, int x, int y) {

include/ScreenCapture.h

@@ -73,7 +73,7 @@ namespace SL {
 			CaptureCallback CaptureDifMonitor;
 			//min interval between mouse captures
 			int Mouse_Capture_Interval;
-			//the function to be called on each mouse interval
+			//the function to be called on each mouse interval. If a the mouse image has changed, img will not be null, otherwise, the only change is new mouse coords
 			MouseCallback CaptureMouse;
 		};
 		class ScreenCaptureManagerImpl;

src/windows/GDIFrameProcessor.cpp

@@ -13,6 +13,7 @@ namespace SL {
 			std::unique_ptr<char[]> OldImageBuffer, NewImageBuffer;
 			size_t ImageBufferSize;
 			bool FirstRun;
+			std::string MonitorName;
 		};
 
 
@@ -29,8 +30,8 @@ namespace SL {
 		}
 		DUPL_RETURN GDIFrameProcessor::Init(std::shared_ptr<Monitor_Thread_Data> data) {
 			auto Ret = DUPL_RETURN_SUCCESS;
-			auto name = Name(*data->SelectedMonitor);
-			_GDIFrameProcessorImpl->MonitorDC.DC = CreateDCA(name.c_str(), NULL, NULL, NULL);
+			_GDIFrameProcessorImpl->MonitorName = Name(*data->SelectedMonitor);
+			_GDIFrameProcessorImpl->MonitorDC.DC = CreateDCA(_GDIFrameProcessorImpl->MonitorName.c_str(), NULL, NULL, NULL);
 			_GDIFrameProcessorImpl->CaptureDC.DC = CreateCompatibleDC(_GDIFrameProcessorImpl->MonitorDC.DC);
 			_GDIFrameProcessorImpl->CaptureBMP.Bitmap = CreateCompatibleBitmap(_GDIFrameProcessorImpl->MonitorDC.DC, Width(*data->SelectedMonitor), Height(*data->SelectedMonitor));
 
@@ -58,13 +59,21 @@ namespace SL {
 			ret.bottom = Height(*_GDIFrameProcessorImpl->Data->SelectedMonitor);
 			ret.right = Width(*_GDIFrameProcessorImpl->Data->SelectedMonitor);
 
+			DEVMODEA devMode;
+			devMode.dmSize = sizeof(devMode);
+			if(EnumDisplaySettingsA(_GDIFrameProcessorImpl->MonitorName.c_str(), ENUM_CURRENT_SETTINGS, &devMode)==TRUE){
+				if (devMode.dmPelsHeight != ret.bottom || devMode.dmPelsWidth != ret.right) {
+					return DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED;
+				}
+			}
+
 			// Selecting an object into the specified DC
 			auto originalBmp = SelectObject(_GDIFrameProcessorImpl->CaptureDC.DC, _GDIFrameProcessorImpl->CaptureBMP.Bitmap);
 
 			if (BitBlt(_GDIFrameProcessorImpl->CaptureDC.DC, 0, 0, ret.right, ret.bottom, _GDIFrameProcessorImpl->MonitorDC.DC, 0, 0, SRCCOPY | CAPTUREBLT) == FALSE) {
 				//if the screen cannot be captured, return
 				SelectObject(_GDIFrameProcessorImpl->CaptureDC.DC, originalBmp);
-				Ret = DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED;//likely a permission issue
+				return DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED;//likely a permission issue
 			}
 			else {