=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: shell32/tests: Use BOOL type where appropriate.
Alexandre Julliard
julliard at winehq.org
Mon Oct 21 14:58:24 CDT 2013
Module: wine
Branch: master
Commit: 44b2fd269ecfe31d1c25e6982390749a909027c1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b2fd269ecfe31d1c25e6982390749a909027c1
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Sat Oct 19 15:28:49 2013 +0200
shell32/tests: Use BOOL type where appropriate.
---
dlls/shell32/tests/brsfolder.c | 4 ++--
dlls/shell32/tests/shellpath.c | 6 +++---
dlls/shell32/tests/shlexec.c | 2 +-
dlls/shell32/tests/shlfolder.c | 7 ++++---
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c
index f8e8e16..ad062d0 100644
--- a/dlls/shell32/tests/brsfolder.c
+++ b/dlls/shell32/tests/brsfolder.c
@@ -296,9 +296,9 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR
ok(!ret, "SendMessage returned: %u\n", ret);
SendMessage(hwnd, WM_COMMAND, IDOK, 0);
- return TRUE;
+ return 1;
default:
- return FALSE;
+ return 0;
}
}
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 729a341..5014d9f 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -687,12 +687,12 @@ static char **myARGV;
static char base[MAX_PATH];
static char selfname[MAX_PATH];
-static int init(void)
+static BOOL init(void)
{
myARGC = winetest_get_mainargs(&myARGV);
- if (!GetCurrentDirectoryA(sizeof(base), base)) return 0;
+ if (!GetCurrentDirectoryA(sizeof(base), base)) return FALSE;
strcpy(selfname, myARGV[0]);
- return 1;
+ return TRUE;
}
static void doChild(const char *arg)
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 131e334..9e5ce32 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1885,7 +1885,7 @@ static void test_find_executable(void)
}
if (rc > 32)
{
- int equal;
+ BOOL equal;
equal=strcmp(command, argv0) == 0 ||
/* NT4 returns an extra 0x8 character! */
(strlen(command) == strlen(argv0)+1 && strncmp(command, argv0, strlen(argv0)) == 0);
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 169426e..c866800 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -3001,13 +3001,14 @@ static inline IUnknownImpl *impl_from_IUnknown(IUnknown *iface)
static HRESULT WINAPI unk_fnQueryInterface(IUnknown *iunk, REFIID riid, void** punk)
{
IUnknownImpl *This = impl_from_IUnknown(iunk);
- UINT i, found;
- for(i = found = 0; This->ifaces[i].id != NULL; i++)
+ UINT i;
+ BOOL found = FALSE;
+ for(i = 0; This->ifaces[i].id != NULL; i++)
{
if(IsEqualIID(This->ifaces[i].id, riid))
{
This->ifaces[i].count++;
- found = 1;
+ found = TRUE;
break;
}
}
More information about the wine-cvs
mailing list