Commit 0f64ffd9 authored by Damjan Jovanovic's avatar Damjan Jovanovic Committed by Alexandre Julliard

shell32: Fix non-BOOL returns in BOOL functions.

parent b81eb2ee
...@@ -957,7 +957,7 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL ...@@ -957,7 +957,7 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL
return result; 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)) if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE))
{ {
......
...@@ -230,7 +230,7 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, ...@@ -230,7 +230,7 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2,
FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n", FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n",
unknown1, unknown2, unknown3, unknown4); unknown1, unknown2, unknown3, unknown4);
return -1; return TRUE;
} }
struct new_delivery_notification struct new_delivery_notification
......
...@@ -1190,7 +1190,7 @@ void WINAPI SHFreeUnusedLibraries (void) ...@@ -1190,7 +1190,7 @@ void WINAPI SHFreeUnusedLibraries (void)
BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, LPPOINT pt) BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, LPPOINT pt)
{ {
FIXME("hwnd = %p %p %p\n",hwnd,samples,pt); FIXME("hwnd = %p %p %p\n",hwnd,samples,pt);
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
* DAD_DragEnter [SHELL32.130] * DAD_DragEnter [SHELL32.130]
...@@ -1238,8 +1238,8 @@ BOOL WINAPI DAD_SetDragImage( ...@@ -1238,8 +1238,8 @@ BOOL WINAPI DAD_SetDragImage(
HIMAGELIST himlTrack, HIMAGELIST himlTrack,
LPPOINT lppt) LPPOINT lppt)
{ {
FIXME("%p %p stub\n",himlTrack, lppt); FIXME("%p %p stub\n",himlTrack, lppt);
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
* DAD_ShowDragImage [SHELL32.137] * DAD_ShowDragImage [SHELL32.137]
...@@ -1249,8 +1249,8 @@ BOOL WINAPI DAD_SetDragImage( ...@@ -1249,8 +1249,8 @@ BOOL WINAPI DAD_SetDragImage(
*/ */
BOOL WINAPI DAD_ShowDragImage(BOOL bShow) BOOL WINAPI DAD_ShowDragImage(BOOL bShow)
{ {
FIXME("0x%08x stub\n",bShow); FIXME("0x%08x stub\n",bShow);
return 0; return FALSE;
} }
static const WCHAR szwCabLocation[] = { static const WCHAR szwCabLocation[] = {
...@@ -1344,7 +1344,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs) ...@@ -1344,7 +1344,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs)
*/ */
BOOL WINAPI FileIconInit(BOOL bFullInit) BOOL WINAPI FileIconInit(BOOL bFullInit)
{ FIXME("(%s)\n", bFullInit ? "true" : "false"); { FIXME("(%s)\n", bFullInit ? "true" : "false");
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
...@@ -1551,7 +1551,7 @@ BOOL WINAPI SHWaitForFileToOpen( ...@@ -1551,7 +1551,7 @@ BOOL WINAPI SHWaitForFileToOpen(
DWORD dwTimeout) DWORD dwTimeout)
{ {
FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout); FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout);
return 0; return FALSE;
} }
/************************************************************************ /************************************************************************
......
...@@ -647,7 +647,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW ) ...@@ -647,7 +647,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW )
static BOOL PathQualifyA(LPCSTR pszPath) static BOOL PathQualifyA(LPCSTR pszPath)
{ {
FIXME("%s\n",pszPath); FIXME("%s\n",pszPath);
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
...@@ -656,7 +656,7 @@ static BOOL PathQualifyA(LPCSTR pszPath) ...@@ -656,7 +656,7 @@ static BOOL PathQualifyA(LPCSTR pszPath)
static BOOL PathQualifyW(LPCWSTR pszPath) static BOOL PathQualifyW(LPCWSTR pszPath)
{ {
FIXME("%s\n",debugstr_w(pszPath)); FIXME("%s\n",debugstr_w(pszPath));
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
......
...@@ -1134,7 +1134,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH ...@@ -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 (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo))
{ {
if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op))
return 0; return FALSE;
} }
return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0; return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0;
......
...@@ -372,7 +372,7 @@ static BOOL FileMenu_AppendItemW( ...@@ -372,7 +372,7 @@ static BOOL FileMenu_AppendItemW(
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO)))
{ {
ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize);
return 0; return FALSE;
} }
menudata->bFixedItems = TRUE; menudata->bFixedItems = TRUE;
...@@ -549,7 +549,7 @@ BOOL WINAPI FileMenu_GetLastSelectedItemPidls( ...@@ -549,7 +549,7 @@ BOOL WINAPI FileMenu_GetLastSelectedItemPidls(
LPCITEMIDLIST *ppidlItem) LPCITEMIDLIST *ppidlItem)
{ {
FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem); FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem);
return 0; return FALSE;
} }
#define FM_ICON_SIZE 16 #define FM_ICON_SIZE 16
...@@ -758,7 +758,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID( ...@@ -758,7 +758,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID(
UINT uID) UINT uID)
{ {
TRACE("%p 0x%08x\n", hMenu, uID); TRACE("%p 0x%08x\n", hMenu, uID);
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
...@@ -767,7 +767,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID( ...@@ -767,7 +767,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID(
BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu) BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu)
{ {
TRACE("%p\n", hMenu); TRACE("%p\n", hMenu);
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
...@@ -779,7 +779,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd( ...@@ -779,7 +779,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd(
BOOL bEnable) BOOL bEnable)
{ {
TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable); TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable);
return 0; return FALSE;
} }
/************************************************************************* /*************************************************************************
......
...@@ -900,14 +900,14 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey) ...@@ -900,14 +900,14 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey)
if (lstrcmpiW(inpRegKey, strRegistryPolicyW) && if (lstrcmpiW(inpRegKey, strRegistryPolicyW) &&
lstrcmpiW(inpRegKey, strPolicyW)) lstrcmpiW(inpRegKey, strPolicyW))
/* doesn't match, fail */ /* doesn't match, fail */
return 0; return FALSE;
} }
else else
{ {
if (lstrcmpiA(inpRegKey, strRegistryPolicyA) && if (lstrcmpiA(inpRegKey, strRegistryPolicyA) &&
lstrcmpiA(inpRegKey, strPolicyA)) lstrcmpiA(inpRegKey, strPolicyA))
/* doesn't match, fail */ /* doesn't match, fail */
return 0; return FALSE;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment