Module: wine Branch: master Commit: 0666ac3ed8cb2f3cd692d239c8bd48145553d043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0666ac3ed8cb2f3cd692d239c8...
Author: Frédéric Delanoy frederic.delanoy@gmail.com Date: Tue Oct 22 00:16:09 2013 +0200
shell32: Use BOOL type where appropriate.
---
dlls/shell32/classes.c | 4 ++-- dlls/shell32/control.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 7 ++++--- dlls/shell32/shlview_cmenu.c | 3 ++- dlls/shell32/xdg.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 10ff970..70abfe6 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -58,7 +58,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL
/* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE;
if (bPrependDot) szTemp[0] = '.'; @@ -92,7 +92,7 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP
/* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE;
if (bPrependDot) szTemp[0] = '.'; diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 659a871..fe392e3 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -711,7 +711,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) signed sp = -1; LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; - int quoted = 0; + BOOL quoted = FALSE; CPlApplet *applet;
buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); @@ -746,7 +746,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) if (extraPmtsBuf != NULL) { beg = end = extraPmtsBuf; - quoted = 0; + quoted = FALSE;
for (;;) { ch = *end; diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 6a58879..6b511d2 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -209,7 +209,7 @@ static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) if (lstrcpynW ( lpwStr, lpOle, nwStr)) { return lstrlenW (lpwStr); } - return 0; + return FALSE; }
BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 4bd964c..357e4ff 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1138,7 +1138,7 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, { IGenericSFImpl *This = impl_from_ISFHelper(iface); WCHAR wszNewDir[MAX_PATH]; - DWORD bRes; + BOOL bRes; HRESULT hres = E_FAIL;
TRACE ("(%p)(%s %p)\n", This, debugstr_w(pwszName), ppidlOut); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 686edb0..ac7fd48 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -255,7 +255,8 @@ static DWORD get_drive_map(void) 'P','o','l','i','c','i','e','s','\', 'E','x','p','l','o','r','e','r',0}; static const WCHAR nodrivesW[] = {'N','o','D','r','i','v','e','s',0}; - static DWORD drive_mask, init_done; + static DWORD drive_mask; + static BOOL init_done = FALSE;
if (!init_done) { @@ -277,7 +278,7 @@ static DWORD get_drive_map(void) RegCloseKey( hkey ); } drive_mask = mask; - init_done = 1; + init_done = TRUE; }
return GetLogicalDrives() & ~drive_mask; @@ -626,7 +627,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, static const WCHAR wantsForParsingW[] = { 'W','a','n','t','s','F','o','r','P','a','r','s','i','n', 'g',0 }; - int bWantsForParsing = FALSE; + BOOL bWantsForParsing = FALSE; WCHAR szRegPath[100]; LONG r;
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fb4ef4e..0705948 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -203,7 +203,8 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu(
static void DoOpenExplore(ContextMenu *This, HWND hwnd, LPCSTR verb) { - UINT i, bFolderFound = FALSE; + UINT i; + BOOL bFolderFound = FALSE; LPITEMIDLIST pidlFQ; SHELLEXECUTEINFOA sei;
diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index d05539c..6eb4163 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -282,7 +282,7 @@ BOOL XDG_MakeDirs(const char *path) */ static int dskentry_encode(const char *value, char *output) { - int only_spc = TRUE; + BOOL only_spc = TRUE; int num_written = 0; const char *c; for (c = value; *c; c++)