Damjan Jovanovic : shell32: Fix non-BOOL returns in BOOL functions.

[Alexandre Julliard]

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

Author: Damjan Jovanovic <damjan.jov(a)gmail.com>
Date:   Thu Jan 10 20:54:34 2013 +0200

shell32: Fix non-BOOL returns in BOOL functions.

---

 dlls/shell32/brsfolder.c    |    2 +-
 dlls/shell32/changenotify.c |    2 +-
 dlls/shell32/shellord.c     |   14 +++++++-------
 dlls/shell32/shellpath.c    |    4 ++--
 dlls/shell32/shlfileop.c    |    2 +-
 dlls/shell32/shlmenu.c      |   10 +++++-----
 dlls/shell32/shpolicy.c     |    4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index d48666f..a14c172 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -957,7 +957,7 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL
     return result;
 }
 
-static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos)
+static LRESULT BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos)
 {
     if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE))
     {
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 94efb7a..2fba5b9 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -230,7 +230,7 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2,
     FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n",
           unknown1, unknown2, unknown3, unknown4);
 
-    return -1;
+    return TRUE;
 }
 
 struct new_delivery_notification
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index fcad032..31891e4 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1190,7 +1190,7 @@ void WINAPI SHFreeUnusedLibraries (void)
 BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, LPPOINT pt)
 {
     FIXME("hwnd = %p %p %p\n",hwnd,samples,pt);
-    return 0;
+    return FALSE;
 }
 /*************************************************************************
  * DAD_DragEnter				[SHELL32.130]
@@ -1238,8 +1238,8 @@ BOOL WINAPI DAD_SetDragImage(
 	HIMAGELIST himlTrack,
 	LPPOINT lppt)
 {
-	FIXME("%p %p stub\n",himlTrack, lppt);
-  return 0;
+    FIXME("%p %p stub\n",himlTrack, lppt);
+    return FALSE;
 }
 /*************************************************************************
  * DAD_ShowDragImage				[SHELL32.137]
@@ -1249,8 +1249,8 @@ BOOL WINAPI DAD_SetDragImage(
  */
 BOOL WINAPI DAD_ShowDragImage(BOOL bShow)
 {
-	FIXME("0x%08x stub\n",bShow);
-	return 0;
+    FIXME("0x%08x stub\n",bShow);
+    return FALSE;
 }
 
 static const WCHAR szwCabLocation[] = {
@@ -1344,7 +1344,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs)
  */
 BOOL WINAPI FileIconInit(BOOL bFullInit)
 {	FIXME("(%s)\n", bFullInit ? "true" : "false");
-	return 0;
+	return FALSE;
 }
 
 /*************************************************************************
@@ -1551,7 +1551,7 @@ BOOL WINAPI SHWaitForFileToOpen(
 	DWORD dwTimeout)
 {
 	FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout);
-	return 0;
+	return FALSE;
 }
 
 /************************************************************************
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 6fdd762..875be38 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -647,7 +647,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW )
 static BOOL PathQualifyA(LPCSTR pszPath)
 {
 	FIXME("%s\n",pszPath);
-	return 0;
+	return FALSE;
 }
 
 /*************************************************************************
@@ -656,7 +656,7 @@ static BOOL PathQualifyA(LPCSTR pszPath)
 static BOOL PathQualifyW(LPCWSTR pszPath)
 {
 	FIXME("%s\n",debugstr_w(pszPath));
-	return 0;
+	return FALSE;
 }
 
 /*************************************************************************
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 787ba75..4ef7803 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -1134,7 +1134,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH
     if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo))
     {
         if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op))
-            return 0;
+            return FALSE;
     }
 
     return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0;
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 911feca..5dfdd08 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -372,7 +372,7 @@ static BOOL FileMenu_AppendItemW(
 	if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO)))
 	{
 	  ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize);
-	  return 0;
+	  return FALSE;
 	}
 
 	menudata->bFixedItems = TRUE;
@@ -549,7 +549,7 @@ BOOL WINAPI FileMenu_GetLastSelectedItemPidls(
 	LPCITEMIDLIST	*ppidlItem)
 {
 	FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem);
-	return 0;
+	return FALSE;
 }
 
 #define FM_ICON_SIZE	16
@@ -758,7 +758,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID(
 	UINT	uID)
 {
 	TRACE("%p 0x%08x\n", hMenu, uID);
-	return 0;
+	return FALSE;
 }
 
 /*************************************************************************
@@ -767,7 +767,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID(
 BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu)
 {
 	TRACE("%p\n", hMenu);
-	return 0;
+	return FALSE;
 }
 
 /*************************************************************************
@@ -779,7 +779,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd(
 	BOOL	bEnable)
 {
 	TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable);
-	return 0;
+	return FALSE;
 }
 
 /*************************************************************************
diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c
index 9ca8b46..62e6ab5 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -900,14 +900,14 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey)
             if (lstrcmpiW(inpRegKey, strRegistryPolicyW) &&
                 lstrcmpiW(inpRegKey, strPolicyW))
 	      /* doesn't match, fail */
-	      return 0;
+	      return FALSE;
 	  }
 	  else
 	  {
             if (lstrcmpiA(inpRegKey, strRegistryPolicyA) &&
                 lstrcmpiA(inpRegKey, strPolicyA))
 	      /* doesn't match, fail */
-	      return 0;
+	      return FALSE;
 	  }
 	}