ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC).

This commit is contained in:
Thomas Faber 2015-03-28 13:29:06 +01:00 committed by Alexandre Julliard
parent 966c5dffed
commit 8a390c8661
1 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
dlls/gdi32/enhmetafile.c
View File

@ -2288,6 +2288,7 @@ BOOL WINAPI EnumEnhMetaFile(
SetLastError(ERROR_NOT_ENOUGH_MEMORY); SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE; return FALSE;
} }
info->state.mode = MM_TEXT;
info->state.wndOrgX = 0; info->state.wndOrgX = 0;
info->state.wndOrgY = 0; info->state.wndOrgY = 0;
info->state.wndExtX = 1; info->state.wndExtX = 1;
@ -2338,71 +2339,69 @@ BOOL WINAPI EnumEnhMetaFile(
old_arcdir = SetArcDirection(hdc, AD_COUNTERCLOCKWISE); old_arcdir = SetArcDirection(hdc, AD_COUNTERCLOCKWISE);
old_polyfill = SetPolyFillMode(hdc, ALTERNATE); old_polyfill = SetPolyFillMode(hdc, ALTERNATE);
old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE); old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE);
}
info->state.mode = MM_TEXT; if ( IS_WIN9X() )
{
/* Win95 leaves the vp/win ext/org info alone */
info->init_transform.eM11 = 1.0;
info->init_transform.eM12 = 0.0;
info->init_transform.eM21 = 0.0;
info->init_transform.eM22 = 1.0;
info->init_transform.eDx = 0.0;
info->init_transform.eDy = 0.0;
}
else
{
/* WinNT combines the vp/win ext/org info into a transform */
double xscale, yscale;
xscale = (double)vp_size.cx / (double)win_size.cx;
yscale = (double)vp_size.cy / (double)win_size.cy;
info->init_transform.eM11 = xscale;
info->init_transform.eM12 = 0.0;
info->init_transform.eM21 = 0.0;
info->init_transform.eM22 = yscale;
info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x;
info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y;
if ( IS_WIN9X() ) CombineTransform(&info->init_transform, &savedXform, &info->init_transform);
{ }
/* Win95 leaves the vp/win ext/org info alone */
info->init_transform.eM11 = 1.0;
info->init_transform.eM12 = 0.0;
info->init_transform.eM21 = 0.0;
info->init_transform.eM22 = 1.0;
info->init_transform.eDx = 0.0;
info->init_transform.eDy = 0.0;
}
else
{
/* WinNT combines the vp/win ext/org info into a transform */
double xscale, yscale;
xscale = (double)vp_size.cx / (double)win_size.cx;
yscale = (double)vp_size.cy / (double)win_size.cy;
info->init_transform.eM11 = xscale;
info->init_transform.eM12 = 0.0;
info->init_transform.eM21 = 0.0;
info->init_transform.eM22 = yscale;
info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x;
info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y;
CombineTransform(&info->init_transform, &savedXform, &info->init_transform); if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) )
} {
double xSrcPixSize, ySrcPixSize, xscale, yscale;
XFORM xform;
if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n",
{ lpRect->left, lpRect->top, lpRect->right, lpRect->bottom,
double xSrcPixSize, ySrcPixSize, xscale, yscale; emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right,
XFORM xform; emh->rclFrame.bottom);
TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx;
lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy;
emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, xscale = (double) WIDTH(*lpRect) * 100.0 /
emh->rclFrame.bottom); WIDTH(emh->rclFrame) * xSrcPixSize;
yscale = (double) HEIGHT(*lpRect) * 100.0 /
HEIGHT(emh->rclFrame) * ySrcPixSize;
TRACE("xscale = %f, yscale = %f\n", xscale, yscale);
xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; xform.eM11 = xscale;
ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; xform.eM12 = 0;
xscale = (double) WIDTH(*lpRect) * 100.0 / xform.eM21 = 0;
WIDTH(emh->rclFrame) * xSrcPixSize; xform.eM22 = yscale;
yscale = (double) HEIGHT(*lpRect) * 100.0 / xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left;
HEIGHT(emh->rclFrame) * ySrcPixSize; xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top;
TRACE("xscale = %f, yscale = %f\n", xscale, yscale);
xform.eM11 = xscale; CombineTransform(&info->init_transform, &xform, &info->init_transform);
xform.eM12 = 0; }
xform.eM21 = 0;
xform.eM22 = yscale;
xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left;
xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top;
CombineTransform(&info->init_transform, &xform, &info->init_transform); /* WinNT resets the current vp/win org/ext */
} if ( !IS_WIN9X() )
{
/* WinNT resets the current vp/win org/ext */ SetMapMode(hdc, MM_TEXT);
if ( !IS_WIN9X() && hdc ) SetWindowOrgEx(hdc, 0, 0, NULL);
{ SetViewportOrgEx(hdc, 0, 0, NULL);
SetMapMode(hdc, MM_TEXT); EMF_Update_MF_Xform(hdc, info);
SetWindowOrgEx(hdc, 0, 0, NULL); }
SetViewportOrgEx(hdc, 0, 0, NULL);
EMF_Update_MF_Xform(hdc, info);
} }
ret = TRUE; ret = TRUE;