=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: setupapi/tests: Use BOOL type where appropriate.
Alexandre Julliard
julliard at winehq.org
Mon Jan 6 14:47:13 CST 2014
Module: wine
Branch: master
Commit: 4ec00cb2c2ba4a8847cdef73fc49aecbbf903c62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec00cb2c2ba4a8847cdef73fc49aecbbf903c62
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Sat Jan 4 15:48:24 2014 +0100
setupapi/tests: Use BOOL type where appropriate.
---
dlls/setupapi/tests/diskspace.c | 8 +++---
dlls/setupapi/tests/parser.c | 54 +++++++++++++++++++-------------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c
index 573eb73..4e87ea9 100644
--- a/dlls/setupapi/tests/diskspace.c
+++ b/dlls/setupapi/tests/diskspace.c
@@ -29,6 +29,8 @@
#include "wine/test.h"
+static BOOL is_win9x;
+
static void test_SetupCreateDiskSpaceListA(void)
{
HDSKSPC ret;
@@ -149,8 +151,6 @@ static void test_SetupCreateDiskSpaceListW(void)
static void test_SetupDuplicateDiskSpaceListA(void)
{
HDSKSPC handle, duplicate;
- int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) &&
- GetLastError() == ERROR_CALL_NOT_IMPLEMENTED;
if (is_win9x)
win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n");
@@ -305,8 +305,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void)
BOOL ret;
HDSKSPC handle;
LONGLONG space;
- int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) &&
- GetLastError() == ERROR_CALL_NOT_IMPLEMENTED;
if (is_win9x)
win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n");
@@ -476,6 +474,8 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void)
START_TEST(diskspace)
{
+ is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) &&
+ GetLastError() == ERROR_CALL_NOT_IMPLEMENTED;
test_SetupCreateDiskSpaceListA();
test_SetupCreateDiskSpaceListW();
test_SetupDuplicateDiskSpaceListA();
diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index bd3132c..c2d554a 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -103,36 +103,36 @@ static const struct
const char *data;
DWORD error;
UINT err_line;
- int todo;
+ BOOL todo;
} invalid_files[] =
{
/* file contents expected error (or 0) errline todo */
- { "\r\n", ERROR_WRONG_INF_STYLE, 0, 0 },
- { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, 1 },
- { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, 0 },
- { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, 0 },
- { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, 0 },
- { "[version]\nsignature=$chicago$", 0, 0, 0 },
- { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, 0 },
- { "[Version]\nSignature=$chicago$,abcd", 0, 0, 0 },
- { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, 0 },
- { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, 0 },
- { STD_HEADER, 0, 0, 0 },
- { STD_HEADER "[]\r\n", 0, 0, 0 },
- { STD_HEADER "]\r\n", 0, 0, 0 },
- { STD_HEADER "[" A255 "]\r\n", 0, 0, 0 },
- { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 },
- { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, 0 },
- { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, 0 },
- { "[abc]\n" STD_HEADER, 0, 0, 0 },
- { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, 0 },
- { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 },
- { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 },
- { ";aa\n;bb\n" STD_HEADER, 0, 0, 0 },
- { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 },
- { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 },
- { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 },
- { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 },
+ { "\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE },
+ { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, TRUE },
+ { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE },
+ { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, FALSE },
+ { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, FALSE },
+ { "[version]\nsignature=$chicago$", 0, 0, FALSE },
+ { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, FALSE },
+ { "[Version]\nSignature=$chicago$,abcd", 0, 0, FALSE },
+ { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, FALSE },
+ { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, FALSE },
+ { STD_HEADER, 0, 0, FALSE },
+ { STD_HEADER "[]\r\n", 0, 0, FALSE },
+ { STD_HEADER "]\r\n", 0, 0, FALSE },
+ { STD_HEADER "[" A255 "]\r\n", 0, 0, FALSE },
+ { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
+ { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, FALSE },
+ { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, FALSE },
+ { "[abc]\n" STD_HEADER, 0, 0, FALSE },
+ { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE },
+ { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE },
+ { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE },
+ { ";aa\n;bb\n" STD_HEADER, 0, 0, FALSE },
+ { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
+ { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
+ { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
+ { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
};
static void test_invalid_files(void)
More information about the wine-cvs
mailing list