From f948f6e437cf8c4c3c27acc7507b6dd004b86110 Mon Sep 17 00:00:00 2001 From: Simon Hofmann Date: Sat, 11 Dec 2021 19:23:02 +0100 Subject: [PATCH] Release 2.1.3 (#90) * (#47) Deleted src/buffer_finalizer.h * (#47) Switched to using Buffer::Copy * Fix for screen highlight window minimized intead close * Create LICENSE.md * Add Helper Methods for calculating the required absolute position on the screen * Refactor moveMouse to use SendInput for absolute position movements on windows * Indentation * Add Coord constant * Squash x and y coord methods Make Absolute coord calculation return MMPoint * Call coord calculator with MMPoint * Correct Types and Return values * Import for getMainDisplaySize * Bugfix for lost co-ordinate precision * (nut-tree/nut.js#249) Enable DPI awareness when fetching screen content to always capture the full screen content even with scaling applied * (nut-tree/nut.js#249) Refactor scale calculation to work correctly with custom regions * (nut-tree/nut.js#306) Specify supported os and cpu in package.json to enable Apple Silicon * Remove scan code block * Release/v2.1.3 (#88) * Update changelog for v2.1.3 * Release v2.1.3 Co-authored-by: Gyula Madarasz Co-authored-by: Reiss Cashmore --- CHANGELOG.md | 10 ++ LICENSE.md | 201 ++++++++++++++++++++++++++++++++++++ package-lock.json | 48 ++++----- package.json | 13 ++- src/buffer_finalizer.h | 14 --- src/main.cc | 16 +-- src/win32/highlightwindow.c | 2 +- src/win32/keypress.c | 6 -- src/win32/mouse.c | 29 +++++- src/win32/screengrab.c | 16 +-- 10 files changed, 285 insertions(+), 70 deletions(-) create mode 100644 LICENSE.md delete mode 100644 src/buffer_finalizer.h diff --git a/CHANGELOG.md b/CHANGELOG.md index 17564a2..a2755a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. +## 2.1.3 + +- Enhancement: Fix undefined behaviour of BufferFinalizer [(#47)](https://github.com/nut-tree/libnut/issues/47) +- Bugfix: Fix for screen highlight window minimized intead close [(PR #77)](https://github.com/nut-tree/libnut/pull/77) +- Enhancement: SendInput for mouse movement on Windows [(#26)](https://github.com/nut-tree/libnut/issues/26) +- Bugfix: Windows Scaling issues: screen functions broken [(nut-tree/nut.js#249)](https://github.com/nut-tree/nut.js/issues/249) +- Enhancement: Support Apple Silicon [(nut-tree/nut.js#306)](https://github.com/nut-tree/nut.js/issues/306) +- Bugfix: Remove scan code KEYUP block [(PR #87)](https://github.com/nut-tree/libnut/pull/87) + ## 2.1.2 - Maintenance: Upgrade CI [(#56)](https://github.com/nut-tree/libnut/issues/56) @@ -9,6 +18,7 @@ All notable changes to this project will be documented in this file. - Enhancement: Windows: Support for HDPI displays [(#59)](https://github.com/nut-tree/libnut/issues/59) - Enhancement: macOS: Support for M1 chips [(PR #50)](https://github.com/nut-tree/libnut/pull/50) - Enhancement: Remove static keyboard delay [(PR #64)](https://github.com/nut-tree/libnut/pull/64) + ## 2.1.1 - Enhancement: Snapshot releases [(#4)](https://github.com/nut-tree/libnut/issues/4) diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/package-lock.json b/package-lock.json index 779c674..470c108 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "libnut", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -505,9 +505,9 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, "json-schema-traverse": { "version": "0.4.1", @@ -520,13 +520,13 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.2.3", + "json-schema": "0.4.0", "verror": "1.10.0" } }, @@ -620,9 +620,9 @@ }, "dependencies": { "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" } } }, @@ -860,23 +860,23 @@ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, "tar": { - "version": "4.4.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", - "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "version": "4.4.19", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz", + "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==", "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "chownr": "^1.1.4", + "fs-minipass": "^1.2.7", + "minipass": "^2.9.0", + "minizlib": "^1.3.3", + "mkdirp": "^0.5.5", + "safe-buffer": "^5.2.1", + "yallist": "^3.1.1" }, "dependencies": { "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" } } }, diff --git a/package.json b/package.json index ef755e4..65ba48f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libnut", - "version": "2.1.2", + "version": "2.1.3", "description": "libnut is an N-API module for desktop automation with node", "main": "index.js", "typings": "index.d.ts", @@ -41,5 +41,14 @@ }, "engines": { "node": ">=10.15.3" - } + }, + "os": [ + "darwin", + "linux", + "win32" + ], + "cpu": [ + "x64", + "arm64" + ] } diff --git a/src/buffer_finalizer.h b/src/buffer_finalizer.h deleted file mode 100644 index 396d164..0000000 --- a/src/buffer_finalizer.h +++ /dev/null @@ -1,14 +0,0 @@ -template -class BufferFinalizer -{ -public: - void operator()(Napi::Env env, T *data) - { - (void)env; - if (data != nullptr) - { - delete data; - } - } -}; - diff --git a/src/main.cc b/src/main.cc index 251a0c9..47562f9 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,5 @@ #include -#include "buffer_finalizer.h" #include "keypress.h" #include "microsleep.h" #include "MMBitmap.h" @@ -11,7 +10,6 @@ int mouseDelay = 10; int keyboardDelay = 10; -static BufferFinalizer finalizer; /* __ __ @@ -243,12 +241,6 @@ Napi::Number _scrollMouse(const Napi::CallbackInfo &info) return Napi::Number::New(env, 1); } -Napi::Number _theAnswer(const Napi::CallbackInfo &info) { - Napi::Env env = info.Env(); - - return Napi::Number::New(env, 42); -} - /* _ __ _ _ | |/ /___ _ _| |__ ___ __ _ _ __ __| | @@ -761,8 +753,8 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info) throw Napi::Error::New(env, "Error: Failed to capture screen"); } - uint32_t bufferSize = (uint32_t)(bitmap->bytewidth * bitmap->height); - Napi::Buffer buffer = Napi::Buffer::New(env, (char *)bitmap->imageBuffer, bufferSize, finalizer); + uint64_t bufferSize = bitmap->bytewidth * bitmap->height; + Napi::Buffer buffer = Napi::Buffer::Copy(env, (char *)bitmap->imageBuffer, bufferSize); Napi::Object obj = Napi::Object::New(env); obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)bitmap->width)); @@ -772,12 +764,12 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info) obj.Set(Napi::String::New(env, "bytesPerPixel"), Napi::Number::New(env, bitmap->bytesPerPixel)); obj.Set(Napi::String::New(env, "image"), buffer); + destroyMMBitmap(bitmap); + return obj; } Napi::Object Init(Napi::Env env, Napi::Object exports) { - exports.Set(Napi::String::New(env, "theAnswer"), Napi::Function::New(env, _theAnswer)); - exports.Set(Napi::String::New(env, "dragMouse"), Napi::Function::New(env, _dragMouse)); exports.Set(Napi::String::New(env, "moveMouse"), Napi::Function::New(env, _moveMouse)); exports.Set(Napi::String::New(env, "getMousePos"), Napi::Function::New(env, _getMousePos)); diff --git a/src/win32/highlightwindow.c b/src/win32/highlightwindow.c index 8c27e30..7973bb1 100644 --- a/src/win32/highlightwindow.c +++ b/src/win32/highlightwindow.c @@ -65,7 +65,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) switch(wParam) { case ID_CLOSE_TIMER: KillTimer(hwnd, ID_CLOSE_TIMER); - CloseWindow(hwnd); + DestroyWindow(hwnd); PostQuitMessage(0); return 0; } diff --git a/src/win32/keypress.c b/src/win32/keypress.c index 04ed0f8..b4a2ca4 100644 --- a/src/win32/keypress.c +++ b/src/win32/keypress.c @@ -53,12 +53,6 @@ void win32KeyEvent(int key, MMKeyFlags flags) } } - /* Set the scan code for keyup */ - if (flags & KEYEVENTF_KEYUP) - { - scan |= 0x80; - } - INPUT keyboardInput; keyboardInput.type = INPUT_KEYBOARD; keyboardInput.ki.wScan = (WORD)scan; diff --git a/src/win32/mouse.c b/src/win32/mouse.c index 0fb7eed..bac56df 100644 --- a/src/win32/mouse.c +++ b/src/win32/mouse.c @@ -1,4 +1,5 @@ #include "../mouse.h" +#include "../screen.h" #include "../microsleep.h" #include /* For floor() */ @@ -7,6 +8,15 @@ #define M_SQRT2 1.4142135623730950488016887 /* Fix for MSVC. */ #endif +/** + * This constant is required as Windows divides the entire + * screen space into 65536 segments in both X and Y axes + * irrespective of resolution + * https://docs.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-mouseinput#remarks + */ + #define ABSOLUTE_COORD_CONST 65536 + + #define MMMouseToMEventF(down, button) \ (down ? MMMouseDownToMEventF(button) : MMMouseUpToMEventF(button)) @@ -20,13 +30,26 @@ : ((button) == RIGHT_BUTTON ? MOUSEEVENTF_RIGHTDOWN \ : MOUSEEVENTF_MIDDLEDOWN)) +MMPoint CalculateAbsoluteCoordinates(MMPoint point) { + MMSize displaySize = getMainDisplaySize(); + return MMPointMake(((float) point.x / displaySize.width) * ABSOLUTE_COORD_CONST, ((float) point.y / displaySize.height) * ABSOLUTE_COORD_CONST); +} + /** * Move the mouse to a specific point. * @param point The coordinates to move the mouse to (x, y). */ -void moveMouse(MMPoint point) -{ - SetCursorPos ((int)point.x, (int)point.y); +void moveMouse(MMPoint point) { + INPUT mouseInput; + MMPoint pointAbsolute = CalculateAbsoluteCoordinates(point); + mouseInput.type = INPUT_MOUSE; + mouseInput.mi.dx = pointAbsolute.x; + mouseInput.mi.dy = pointAbsolute.y; + mouseInput.mi.mouseData = 0; + mouseInput.mi.time = 0; + mouseInput.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + mouseInput.mi.dwExtraInfo = 0; + SendInput(1, & mouseInput, sizeof(mouseInput)); } void dragMouse(MMPoint point, const MMMouseButton button) diff --git a/src/win32/screengrab.c b/src/win32/screengrab.c index 049a0fa..a9f4740 100644 --- a/src/win32/screengrab.c +++ b/src/win32/screengrab.c @@ -3,17 +3,17 @@ #include /* malloc() */ MMRect getScaledRect(MMRect input, HDC imageSource) { - BITMAP structBitmapHeader; - memset( &structBitmapHeader, 0, sizeof(BITMAP) ); - - HGDIOBJ hBitmap = GetCurrentObject(imageSource, OBJ_BITMAP); - GetObject(hBitmap, sizeof(BITMAP), &structBitmapHeader); - + // Configure DPI awareness to fetch unscaled display size + DPI_AWARENESS_CONTEXT initialDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); + size_t scaledDesktopWidth = (size_t)GetSystemMetrics(SM_CXSCREEN); + size_t scaledDesktopHeight = (size_t)GetSystemMetrics(SM_CYSCREEN); + // Reset DPI awareness to avoid inconsistencies on future calls to copyMMBitmapFromDisplayInRect + SetThreadDpiAwarenessContext(initialDpiAwareness); size_t desktopWidth = (size_t)GetSystemMetrics(SM_CXSCREEN); size_t desktopHeight = (size_t)GetSystemMetrics(SM_CYSCREEN); - double scaleX = (double)(structBitmapHeader.bmWidth / desktopWidth); - double scaleY = (double)(structBitmapHeader.bmHeight / desktopHeight); + double scaleX = (double)(desktopWidth / (double)scaledDesktopWidth); + double scaleY = (double)(desktopHeight / (double)scaledDesktopHeight); return MMRectMake(input.origin.x, input.origin.y, input.size.width * scaleX, input.size.height * scaleY); }