=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: comdlg32: Use BOOL type where appropriate.
Alexandre Julliard
julliard at winehq.org
Fri Oct 11 10:11:12 CDT 2013
Module: wine
Branch: master
Commit: 8e7abd00a85cc89d890878a447be0ae885d1ac52
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7abd00a85cc89d890878a447be0ae885d1ac52
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Thu Oct 10 21:52:41 2013 +0200
comdlg32: Use BOOL type where appropriate.
---
dlls/comdlg32/filedlg.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index c08e8d4..850edad 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -1431,9 +1431,9 @@ static inline BOOL filename_is_edit( const FileOpenDlgInfos *info )
*/
static LRESULT FILEDLG95_InitControls(HWND hwnd)
{
- int win2000plus = 0;
- int win98plus = 0;
- int handledPath = FALSE;
+ BOOL win2000plus = FALSE;
+ BOOL win98plus = FALSE;
+ BOOL handledPath = FALSE;
OSVERSIONINFOW osVi;
static const WCHAR szwSlash[] = { '\\', 0 };
static const WCHAR szwStar[] = { '*',0 };
@@ -1584,12 +1584,11 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
}
/* 2. (All platforms) If initdir is not null, then use it */
- if ((handledPath == FALSE) && (fodInfos->initdir!=NULL) &&
- (*fodInfos->initdir!=0x00))
+ if (!handledPath && fodInfos->initdir && *fodInfos->initdir)
{
/* Work out the proper path as supplied one might be relative */
/* (Here because supplying '.' as dir browses to My Computer) */
- if (handledPath==FALSE) {
+ if (!handledPath) {
WCHAR tmpBuf[MAX_PATH];
WCHAR tmpBuf2[MAX_PATH];
WCHAR *nameBit;
@@ -1624,8 +1623,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
}
}
- if ((handledPath == FALSE) && ((fodInfos->initdir==NULL) ||
- (*fodInfos->initdir==0x00)))
+ if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir))
{
/* 3. All except w2k+: if filename contains a path use it */
if (!win2000plus && fodInfos->filename &&
@@ -1657,7 +1655,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
}
/* 4. Win2000+: Recently used */
- if (handledPath == FALSE && win2000plus) {
+ if (!handledPath && win2000plus) {
fodInfos->initdir = MemAlloc(MAX_PATH * sizeof(WCHAR));
fodInfos->initdir[0] = '\0';
@@ -1673,8 +1671,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
/* 5. win98+ and win2000+ if any files of specified filter types in
current directory, use it */
- if ( win98plus && handledPath == FALSE &&
- fodInfos->filter && *fodInfos->filter) {
+ if (win98plus && !handledPath && fodInfos->filter && *fodInfos->filter) {
LPCWSTR lpstrPos = fodInfos->filter;
WIN32_FIND_DATAW FindFileData;
@@ -1713,7 +1710,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
}
/* 6. Win98+ and 2000+: Use personal files dir, others use current dir */
- if (handledPath == FALSE && (win2000plus || win98plus)) {
+ if (!handledPath && (win2000plus || win98plus)) {
fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR));
if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir))
@@ -1730,7 +1727,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
TRACE("No initial dir specified, using personal files dir of %s\n", debugstr_w(fodInfos->initdir));
}
handledPath = TRUE;
- } else if (handledPath==FALSE) {
+ } else if (!handledPath) {
fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR));
GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir);
handledPath = TRUE;
More information about the wine-cvs
mailing list