[PATCH v2 1/3] setupapi/tests: Change return values from coinst functions.
Jeff Smith
whydoubt at gmail.com
Wed Jul 29 09:29:23 CDT 2020
As co_error and class_error both return 0xdeadbeef, use of 0xdeadbeef as
a canary value as well can lead to ambiguous tests results.
As 0xdeadbeef is a typical canary value in wine, change the return
values for co_error and class_error, avoiding the potential ambiguity.
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
v2: Replace E_FAIL with 0xdeadc0de for the value returned by class_error
and co_error (i.e. the value we want to be distinct from the canary
value set in tests/devinst.c).
dlls/setupapi/tests/coinst.c | 4 ++--
dlls/setupapi/tests/devinst.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/setupapi/tests/coinst.c b/dlls/setupapi/tests/coinst.c
index 5e8d890cfa5..ba526a5d3a1 100644
--- a/dlls/setupapi/tests/coinst.c
+++ b/dlls/setupapi/tests/coinst.c
@@ -47,7 +47,7 @@ DWORD WINAPI class_default(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *
DWORD WINAPI class_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device)
{
- return 0xdeadbeef;
+ return 0xdeadc0de;
}
DWORD WINAPI co_success(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device,
@@ -67,5 +67,5 @@ DWORD WINAPI CoDeviceInstall(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA
DWORD WINAPI co_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device,
COINSTALLER_CONTEXT_DATA *context)
{
- return 0xdeadbeef;
+ return 0xdeadc0de;
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index d4c82dea1f6..cb77fdf3c46 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -2727,17 +2727,17 @@ static void test_class_installer(void)
ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device);
ok(!ret, "Expected failure.\n");
- ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError());
+ ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError());
ok(!device_is_registered(set, &device), "Expected device not to be registered.\n");
ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device);
ok(!ret, "Expected failure.\n");
- ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError());
+ ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError());
ok(!device_is_registered(set, &device), "Expected device not to be registered.\n");
ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device);
ok(!ret, "Expected failure.\n");
- ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError());
+ ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError());
ok(!device_is_registered(set, &device), "Expected device not to be registered.\n");
SetupDiDestroyDeviceInfoList(set);
@@ -2875,12 +2875,12 @@ static void test_class_coinstaller(void)
ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device);
ok(!ret, "Expected failure.\n");
- ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError());
+ ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError());
ok(!device_is_registered(set, &device), "Expected device not to be registered.\n");
ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device);
ok(!ret, "Expected failure.\n");
- ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError());
+ ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError());
ok(!device_is_registered(set, &device), "Expected device not to be registered.\n");
SetupDiDestroyDeviceInfoList(set);
--
2.23.0
More information about the wine-devel
mailing list