Dmitry Timoshkov : gdi32: Do not reselect objects while recording a metafile, that' s done at the playing time.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d01438bd538ef7a69ea7ad773579523c876fe1d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d01438bd538ef7a69ea7ad7735...

Author: Dmitry Timoshkov 
Date:   Mon Apr 28 16:01:40 2008 +0900

gdi32: Do not reselect objects while recording a metafile, that's done at the playing time.

---

dlls/gdi32/dc.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index cb4de19..9baa7e4 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -315,8 +315,9 @@ void DC_UpdateXforms( DC *dc )

/* Reselect the font and pen back into the dc so that the size
        gets updated. */
-    if (oldworld2vport.eM11 != dc->xformWorld2Vport.eM11 ||
-        oldworld2vport.eM22 != dc->xformWorld2Vport.eM22)
+    if ((oldworld2vport.eM11 != dc->xformWorld2Vport.eM11 ||
+         oldworld2vport.eM22 != dc->xformWorld2Vport.eM22) &&
+         !GdiIsMetaFileDC(dc->hSelf))
     {
         SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT));
         SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN));