Skip to content

W
wine-winehq
Commit 4f5838fb authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard
Browse files
Options

Fix EMF positioning when rclFrame has a non-zero origin.

parent 40774c3c
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
objects/enhmetafile.c
View file @ 4f5838fb
...@@ -1292,6 +1292,11 @@ BOOL WINAPI EnumEnhMetaFile( ...@@ -1292,6 +1292,11 @@ BOOL WINAPI EnumEnhMetaFile(
if (hdc) if (hdc)
{ {
TRACE("rect: %d,%d - %d,%d. rclFrame: %ld,%ld - %ld,%ld\n",
lpRect->left, lpRect->top, lpRect->right, lpRect->bottom,
emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right,
emh->rclFrame.bottom);
xSrcPixSize = (FLOAT) emh->szlMillimeters.cx / emh->szlDevice.cx; xSrcPixSize = (FLOAT) emh->szlMillimeters.cx / emh->szlDevice.cx;
ySrcPixSize = (FLOAT) emh->szlMillimeters.cy / emh->szlDevice.cy; ySrcPixSize = (FLOAT) emh->szlMillimeters.cy / emh->szlDevice.cy;
xscale = (FLOAT)(lpRect->right - lpRect->left) * 100.0 / xscale = (FLOAT)(lpRect->right - lpRect->left) * 100.0 /
...@@ -1303,8 +1308,10 @@ BOOL WINAPI EnumEnhMetaFile( ...@@ -1303,8 +1308,10 @@ BOOL WINAPI EnumEnhMetaFile(
xform.eM12 = 0; xform.eM12 = 0;
xform.eM21 = 0; xform.eM21 = 0;
xform.eM22 = yscale; xform.eM22 = yscale;
xform.eDx = (FLOAT)lpRect->left - (xscale * emh->rclFrame.left * 0.5); xform.eDx = (FLOAT) lpRect->left - (lpRect->right - lpRect->left) *
xform.eDy = (FLOAT)lpRect->top - (yscale * (FLOAT)emh->rclFrame.top * 0.5); emh->rclFrame.left / (emh->rclFrame.right - emh->rclFrame.left);
xform.eDy = (FLOAT) lpRect->top - (lpRect->bottom - lpRect->top) *
emh->rclFrame.top / (emh->rclFrame.bottom - emh->rclFrame.top);
savedMode = SetGraphicsMode(hdc, GM_ADVANCED); savedMode = SetGraphicsMode(hdc, GM_ADVANCED);
GetWorldTransform(hdc, &savedXform); GetWorldTransform(hdc, &savedXform);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment