Index: dll/win32/shell32/shlmenu.cpp
===================================================================
--- dll/win32/shell32/shlmenu.cpp	(revision 60811)
+++ dll/win32/shell32/shlmenu.cpp	(working copy)
@@ -166,7 +166,7 @@
           LPITEMIDLIST pidlTemp = NULL;
           ULONG ulFetched;
 
-          while ((!bAbortInit) && (NOERROR == lpe->Next(1,&pidlTemp,&ulFetched)))
+          while ((!bAbortInit) && (S_OK == lpe->Next(1,&pidlTemp,&ulFetched)))
           {
         if (SUCCEEDED (lpsf->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr)))
         {
@@ -354,7 +354,7 @@
     if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO)))
     {
       ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize);
-      return 0;
+      return FALSE;
     }
 
     menudata->bFixedItems = TRUE;
@@ -531,7 +531,7 @@
     LPCITEMIDLIST    *ppidlItem)
 {
     FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem);
-    return 0;
+    return FALSE;
 }
 
 #define FM_ICON_SIZE    16
@@ -740,7 +740,7 @@
     UINT    uID)
 {
     TRACE("%p 0x%08x\n", hMenu, uID);
-    return 0;
+    return FALSE;
 }
 
 /*************************************************************************
@@ -749,7 +749,7 @@
 BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu)
 {
     TRACE("%p\n", hMenu);
-    return 0;
+    return FALSE;
 }
 
 /*************************************************************************
@@ -761,7 +761,7 @@
     BOOL    bEnable)
 {
     TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable);
-    return 0;
+    return FALSE;
 }
 
 /*************************************************************************