Dmitry Timoshkov : gdi32: info->state.next is always NULL, there is no need to save/restore it.

Alexandre Julliard julliard at winehq.org
Tue Apr 29 08:54:37 CDT 2008


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

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Tue Apr 29 14:48:55 2008 +0900

gdi32: info->state.next is always NULL, there is no need to save/restore it.

---

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

diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 7c6068d..378ac4f 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -557,11 +557,7 @@ static void EMF_RestoreDC( enum_emh_data *info, INT level )
         info->saved_state = state->next;
         state->next = NULL;
         if (--info->save_level < level)
-        {
-            EMF_dc_state *next = info->state.next;
             info->state = *state;
-            info->state.next = next;
-        }
         HeapFree( GetProcessHeap(), 0, state );
     }
 }
@@ -2279,7 +2275,7 @@ BOOL WINAPI EnumEnhMetaFile(
         return FALSE;
     }
 
-    info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
+    info = HeapAlloc( GetProcessHeap(), 0,
 		    sizeof (enum_emh_data) + sizeof(HANDLETABLE) * emh->nHandles );
     if(!info)
     {
@@ -2298,6 +2294,7 @@ BOOL WINAPI EnumEnhMetaFile(
     info->state.world_transform.eM12 = info->state.world_transform.eM21 = 0;
     info->state.world_transform.eDx  = info->state.world_transform.eDy =  0;
 
+    info->state.next = NULL;
     info->save_level = 0;
     info->saved_state = NULL;
 




More information about the wine-cvs mailing list