Alistair Leslie-Hughes : wintab32/tests: Improve WTInfoA tests.

Module: wine Branch: master Commit: 911e9dad0283a9893054a673811f9272b284f6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=911e9dad0283a9893054a673… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 29 23:02:23 2019 +0000 wintab32/tests: Improve WTInfoA tests. Some older WACOM tables dont support DVC_Z, DVC_TPRESSURE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/tests/context.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 3eb1315..a88e4bb 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -160,6 +160,9 @@ static void test_WTInfoA(void) ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); trace("DVC_NAME %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_HARDWARE, name ); + trace("DVC_HARDWARE %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); @@ -169,16 +172,20 @@ static void test_WTInfoA(void) trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); - trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_Z not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); - trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_TPRESSURE not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret);