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

7
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,9 +2339,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() )
{ {
@ -2397,13 +2395,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;