Index: base/shell/explorer-new/taskswnd.c
===================================================================
--- base/shell/explorer-new/taskswnd.c	(revision 58241)
+++ base/shell/explorer-new/taskswnd.c	(working copy)
@@ -709,13 +709,10 @@
 
     /* Allocate a new task group */
     TaskGroup = HeapAlloc(hProcessHeap,
-                          0,
+                          HEAP_ZERO_MEMORY,
                           sizeof(*TaskGroup));
     if (TaskGroup != NULL)
     {
-        ZeroMemory(TaskGroup,
-                   sizeof(*TaskGroup));
-
         TaskGroup->dwTaskCount = 1;
         TaskGroup->dwProcessId = dwProcessId;
         TaskGroup->Index = -1;
@@ -2065,13 +2062,11 @@
             {
                 LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam;
                 This = HeapAlloc(hProcessHeap,
-                                 0,
+                                 HEAP_ZERO_MEMORY,
                                  sizeof(*This));
                 if (This == NULL)
                     return FALSE;
 
-                ZeroMemory(This,
-                           sizeof(*This));
                 This->hWnd = hwnd;
                 This->hWndNotify = CreateStruct->hwndParent;
                 This->Tray = (ITrayWindow*)CreateStruct->lpCreateParams;
Index: base/shell/explorer-new/startmnu.c
===================================================================
--- base/shell/explorer-new/startmnu.c	(revision 58241)
+++ base/shell/explorer-new/startmnu.c	(working copy)
@@ -773,14 +773,11 @@
     IStartMenuSiteImpl *This;
 
     This = HeapAlloc(hProcessHeap,
-                     0,
+                     HEAP_ZERO_MEMORY,
                      sizeof(*This));
     if (This == NULL)
         return NULL;
 
-    ZeroMemory(This,
-               sizeof(*This));
-
     This->lpVtbl = &IStartMenuSiteImpl_Vtbl;
     This->lpServiceProviderVtbl = &IServiceProviderImpl_Vtbl;
     This->lpStartMenuCallbackVtbl = &ITrayPrivImpl_Vtbl;
Index: base/shell/explorer-new/dragdrop.c
===================================================================
--- base/shell/explorer-new/dragdrop.c	(revision 58241)
+++ base/shell/explorer-new/dragdrop.c	(working copy)
@@ -131,14 +131,11 @@
     HRESULT hr;
 
     This = HeapAlloc(hProcessHeap,
-                     0,
+                     HEAP_ZERO_MEMORY,
                      FIELD_OFFSET(IDropTargetImpl,
                                   Formats[nSupportedFormats]));
     if (This != NULL)
     {
-        ZeroMemory(This,
-                   sizeof(*This));
-
         This->lpVtbl = &IDropTargetImpl_Vtbl;
         This->Ref = 1;
         This->hwndTarget = hwndTarget;
Index: base/shell/explorer-new/trayntfy.c
===================================================================
--- base/shell/explorer-new/trayntfy.c	(revision 58241)
+++ base/shell/explorer-new/trayntfy.c	(working copy)
@@ -615,12 +615,10 @@
     HWND hWnd = NULL;
 
     SpData = HeapAlloc(hProcessHeap,
-                       0,
+                       HEAP_ZERO_MEMORY,
                        sizeof(*SpData));
     if (SpData != NULL)
     {
-        ZeroMemory(SpData, sizeof(*SpData));
-
         /* Create the window. The tray window is going to move it to the correct
            position and resize it as needed. */
         dwStyle = WS_CHILD | WS_CLIPSIBLINGS;
@@ -1357,13 +1355,10 @@
     HWND hWnd = NULL;
 
     TcData = HeapAlloc(hProcessHeap,
-                       0,
+                       HEAP_ZERO_MEMORY,
                        sizeof(*TcData));
     if (TcData != NULL)
     {
-        ZeroMemory(TcData,
-                   sizeof(*TcData));
-
         TcData->IsHorizontal = TRUE;
         /* Create the window. The tray window is going to move it to the correct
            position and resize it as needed. */
@@ -1841,13 +1836,10 @@
         return NULL;
 
     TnData = HeapAlloc(hProcessHeap,
-                       0,
+                       HEAP_ZERO_MEMORY,
                        sizeof(*TnData));
     if (TnData != NULL)
     {
-        ZeroMemory(TnData,
-                   sizeof(*TnData));
-
         TnData->TrayWindow = TrayWindow;
         TnData->HideClock = bHideClock;
 
Index: base/shell/explorer-new/taskband.c
===================================================================
--- base/shell/explorer-new/taskband.c	(revision 58241)
+++ base/shell/explorer-new/taskband.c	(working copy)
@@ -629,13 +629,11 @@
     ITaskBandImpl *This;
 
     This = HeapAlloc(hProcessHeap,
-                     0,
+                     HEAP_ZERO_MEMORY,
                      sizeof(*This));
     if (This == NULL)
         return NULL;
 
-    ZeroMemory(This,
-               sizeof(*This));
     This->lpVtbl = &ITaskBandImpl_Vtbl;
     This->lpDeskBandVtbl = &IDeskBandImpl_Vtbl;
     This->lpObjectWithSiteVtbl = &IObjectWithSiteImpl_Vtbl;
Index: base/shell/explorer-new/traywnd.c
===================================================================
--- base/shell/explorer-new/traywnd.c	(revision 58241)
+++ base/shell/explorer-new/traywnd.c	(working copy)
@@ -1620,13 +1620,11 @@
     ITrayWindowImpl *This;
 
     This = HeapAlloc(hProcessHeap,
-                     0,
+                     HEAP_ZERO_MEMORY,
                      sizeof(*This));
     if (This == NULL)
         return NULL;
 
-    ZeroMemory(This,
-               sizeof(*This));
     This->lpVtbl = &ITrayWindowImpl_Vtbl;
     This->lpVtblShellDesktopTray = &IShellDesktopTrayImpl_Vtbl;
     This->Ref = 1;
Index: base/shell/explorer-new/tbsite.c
===================================================================
--- base/shell/explorer-new/tbsite.c	(revision 58241)
+++ base/shell/explorer-new/tbsite.c	(working copy)
@@ -910,13 +910,11 @@
     *phwndTaskSwitch = NULL;
 
     This = HeapAlloc(hProcessHeap,
-                     0,
+                     HEAP_ZERO_MEMORY,
                      sizeof(*This));
     if (This == NULL)
         return NULL;
 
-    ZeroMemory(This,
-               sizeof(*This));
     This->lpVtbl = &ITrayBandSiteImpl_Vtbl;
     This->lpBandSiteVtbl = &IBandSiteImpl_Vtbl;
     This->Ref = 1;