2.4.1.2 - Reverted changes to GetScreenBitmap method in ScreenCapture.

Author: gavinkendall

AutoScreenCaptureSetup/AutoScreenCaptureSetup.vdproj

@@ -233,15 +233,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Auto Screen Capture"
-        "ProductCode" = "8:{00D29CE0-0773-4D87-84A7-07834F129626}"
-        "PackageCode" = "8:{04CC88E6-5729-4E7D-ACA3-D5FB7B847E8B}"
+        "ProductCode" = "8:{A3C76940-36FD-4ACE-A23E-EBA75E2744D4}"
+        "PackageCode" = "8:{4BC699BE-CAE8-4BE3-9CE3-8F6DCC9CE08E}"
         "UpgradeCode" = "8:{6B29B7BC-0101-4495-B28C-26B6D3CDCC02}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.4.11"
+        "ProductVersion" = "8:2.4.12"
         "Manufacturer" = "8:Gavin Kendall"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://sourceforge.net/p/autoscreen/tickets/"

Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.1.1")]
-[assembly: AssemblyFileVersion("2.4.1.1")]
+[assembly: AssemblyVersion("2.4.1.2")]
+[assembly: AssemblyFileVersion("2.4.1.2")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]

ScreenCapture.cs

@@ -452,7 +452,7 @@ private int AddScreenshotAndSaveToFile(Security security, int jpegQuality, Scree
                 // We don't want to stop the screen capture session at this point because there may be other components that
                 // can write to their given paths. If this is a misconfigured path for a particular component then just log an error.
                 _log.WriteErrorMessage($"Cannot write to \"{screenshot.Path}\" because the user may not have the appropriate permissions to access the path");
-                
+
                 return returnFlag | (int)ScreenSavingErrorLevels.UserNotEnoughPermissions;
             }
         }
@@ -589,22 +589,6 @@ public Bitmap GetScreenBitmap(int source, int component, int captureMethod, int
                 Bitmap bmpSource = null;
                 Bitmap bmpDestination = null;
 
-                int destinationX = 0;
-                int destinationY = 0;
-
-                foreach (System.Windows.Forms.Screen windowsScreen in System.Windows.Forms.Screen.AllScreens)
-                {
-                    if (windowsScreen.Bounds.X < destinationX)
-                    {
-                        destinationX = windowsScreen.Bounds.X;
-                    }
-
-                    if (windowsScreen.Bounds.Y < destinationY)
-                    {
-                        destinationY = windowsScreen.Bounds.Y;
-                    }
-                }
-
                 if (width > 0 && height > 0)
                 {
                     if (resolutionRatio < IMAGE_RESOLUTION_RATIO_MIN || resolutionRatio > IMAGE_RESOLUTION_RATIO_MAX)
@@ -640,10 +624,10 @@ public Bitmap GetScreenBitmap(int source, int component, int captureMethod, int
 
                         using (Graphics graphicsSource = Graphics.FromImage(bmpSource))
                         {
-                            graphicsSource.CopyFromScreen(x, y, destinationX, destinationY, blockRegionSize, CopyPixelOperation.SourceCopy);
+                            graphicsSource.CopyFromScreen(x, y, 0, 0, blockRegionSize, CopyPixelOperation.SourceCopy);
 
                             Graphics graphicsDestination = Graphics.FromImage(bmpDestination);
-                            graphicsDestination.DrawImage(bmpSource, destinationX, destinationY, destinationWidth, destinationHeight);
+                            graphicsDestination.DrawImage(bmpSource, 0, 0, destinationWidth, destinationHeight);
 
                             // The mouse pointer gets really weird if we go under 100 resolution ratio so we'll keep the resolution ratio at 100 if the mouse option is enabled.
                             if (mouse && resolutionRatio == 100)
@@ -675,7 +659,7 @@ public Bitmap GetScreenBitmap(int source, int component, int captureMethod, int
                         IntPtr hBitmap = CreateCompatibleBitmap(hdcSrc, width, height);
                         IntPtr hOld = SelectObject(hdcDest, hBitmap);
 
-                        BitBlt(hdcDest, destinationX, destinationY, width, height, hdcSrc, x, y, CopyPixelOperation.SourceCopy | CopyPixelOperation.CaptureBlt);
+                        BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, CopyPixelOperation.SourceCopy | CopyPixelOperation.CaptureBlt);
 
                         if (mouse)
                         {
@@ -962,7 +946,7 @@ public int SaveScreenshot(Security security, int jpegQuality, Screenshot screens
                         {
                             // Drive isn't ready so log an error message.
                             _log.WriteErrorMessage($"Unable to save screenshot for \"{screenshot.Path}\" because the drive is not found or not ready");
-                            
+
                             return returnFlag | (int)ScreenSavingErrorLevels.DriveNotReady;
                         }
                     }

app.manifest

@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.4.1.1"/>
+    version="2.4.1.2"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

interface/about/FormAbout.Designer.cs

@@ -259,6 +259,7 @@ public void Load(FileSystem fileSystem)
             _versionCollection.Add(new Version(CODENAME_BLADE, "2.4.0.8")); // Region Preview fix.
             _versionCollection.Add(new Version(CODENAME_BLADE, "2.4.0.9")); // Allow Active Window to use GDI screen capture method for Screen. Removed logging from FormRegionSelectWithMouse.
             _versionCollection.Add(new Version(CODENAME_BLADE, "2.4.1.0")); // Region Select fix.
+            _versionCollection.Add(new Version(CODENAME_BLADE, "2.4.1.1"));
 
             Application = new SettingCollection()
             {