Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32]

Browse source 
- Fix uninitialized variable use in EnumEnhMetaFile
- Apply Wine commit 88e81025 (gdi32: Fix typo in a condition (PVS-Studio).) by André Hentschel
CORE-9191 #resolve

svn path=/trunk/; revision=67126
This commit is contained in:
Thomas Faber 2015-04-10 09:27:25 +00:00
parent a389855f0a
commit c9fa5328d9
1 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/win32ss/gdi/gdi32/wine/enhmetafile.c
View file

@ -1420,7 +1420,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
if ((info->state.mode != MM_ISOTROPIC) && (info->state.mode != MM_ANISOTROPIC)) if ((info->state.mode != MM_ISOTROPIC) && (info->state.mode != MM_ANISOTROPIC))
break; break;
if (!lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->xDenom || if (!lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->xDenom ||
!lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->yDenom) !lpScaleWindowExtEx->yNum || !lpScaleWindowExtEx->yDenom)
break; break;
info->state.wndExtX = MulDiv(info->state.wndExtX, lpScaleWindowExtEx->xNum, info->state.wndExtX = MulDiv(info->state.wndExtX, lpScaleWindowExtEx->xNum,
lpScaleWindowExtEx->xDenom); lpScaleWindowExtEx->xDenom);
@ -2292,6 +2292,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;
@ -2342,9 +2343,6 @@ 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() ) if ( IS_WIN9X() )
{ {
@ -2401,13 +2399,14 @@ BOOL WINAPI EnumEnhMetaFile(
} }
/* WinNT resets the current vp/win org/ext */ /* WinNT resets the current vp/win org/ext */
if ( !IS_WIN9X() && hdc ) if ( !IS_WIN9X() )
{ {
SetMapMode(hdc, MM_TEXT); SetMapMode(hdc, MM_TEXT);
SetWindowOrgEx(hdc, 0, 0, NULL); SetWindowOrgEx(hdc, 0, 0, NULL);
SetViewportOrgEx(hdc, 0, 0, NULL); SetViewportOrgEx(hdc, 0, 0, NULL);
EMF_Update_MF_Xform(hdc, info); EMF_Update_MF_Xform(hdc, info);
} }
}
ret = TRUE; ret = TRUE;
offset = 0; offset = 0;