Nikolay Sivov : shell32: Remove a useless debug switch, fix prototype.
Alexandre Julliard
julliard at winehq.org
Mon Mar 22 11:12:05 CDT 2010
Module: wine
Branch: master
Commit: 9e80570a3bde8db80412579279b6c27aabb0316a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e80570a3bde8db80412579279b6c27aabb0316a
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun Mar 21 20:08:33 2010 +0300
shell32: Remove a useless debug switch, fix prototype.
---
dlls/shell32/dialogs.c | 2 +-
dlls/shell32/shell32_main.c | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 0d8dbac..fb43390 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -60,7 +60,7 @@ static void FillList (HWND, char *, BOOL) ;
* PickIconDlg [SHELL32.62]
*
*/
-BOOL WINAPI PickIconDlg(
+INT WINAPI PickIconDlg(
HWND hwndOwner,
LPSTR lpstrFile,
DWORD nMaxFile,
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index db63e16..dc71022 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -52,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
extern const char * const SHELL_Authors[];
-#define MORE_DEBUG 1
/*************************************************************************
* CommandLineToArgvW [SHELL32.@]
*
@@ -607,7 +606,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
GetSystemMetrics( SM_CXICON),
GetSystemMetrics( SM_CYICON),
&psfi->hIcon, 0, 1, 0);
- if (ret != 0 && ret != 0xFFFFFFFF)
+ if (ret != 0 && ret != (UINT)-1)
{
IconNotYetLoaded=FALSE;
psfi->iIcon = icon_idx;
@@ -653,11 +652,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
SHFree(pidlLast);
-#ifdef MORE_DEBUG
TRACE ("icon=%p index=0x%08x attr=0x%08x name=%s type=%s ret=0x%08lx\n",
psfi->hIcon, psfi->iIcon, psfi->dwAttributes,
debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret);
-#endif
return ret;
}
@@ -777,17 +774,17 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex
TRACE("%p %s %d\n", hInstance, debugstr_w(lpszFile), nIconIndex);
- if (nIconIndex == 0xFFFFFFFF)
+ if (nIconIndex == (UINT)-1)
{
ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR);
- if (ret != 0xFFFFFFFF && ret)
+ if (ret != (UINT)-1 && ret)
return (HICON)(UINT_PTR)ret;
return NULL;
}
else
ret = PrivateExtractIconsW(lpszFile, nIconIndex, cx, cy, &hIcon, NULL, 1, LR_DEFAULTCOLOR);
- if (ret == 0xFFFFFFFF)
+ if (ret == (UINT)-1)
return (HICON)1;
else if (ret > 0 && hIcon)
return hIcon;
More information about the wine-cvs
mailing list