Revert "gdi32: Reselect objects into the DC only if scaling factors change."

Dmitry Timoshkov dmitry at codeweavers.com
Mon Jul 21 03:15:55 CDT 2008


Hello,

that patch has caused a regression, and should be reverted.

Changelog:
    Revert "gdi32: Reselect objects into the DC only if scaling factors change."

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

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 801a3fd..8e4601d 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -315,9 +315,8 @@ 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) &&
-         !GdiIsMetaFileDC(dc->hSelf))
+    if (memcmp(&oldworld2vport, &dc->xformWorld2Vport, sizeof(oldworld2vport)) &&
+        !GdiIsMetaFileDC(dc->hSelf))
     {
         SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT));
         SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN));
-- 
1.5.6.3






More information about the wine-patches mailing list