Dmitry Timoshkov : comctl32/tests: Fix a test failure under Windows 7.
Alexandre Julliard
julliard at winehq.org
Fri Dec 14 11:57:13 CST 2018
Module: wine
Branch: master
Commit: 685a4b5062bf6b8d6c2171aca999a0411ce4b82e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=685a4b5062bf6b8d6c2171aca999a0411ce4b82e
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Fri Dec 14 14:10:18 2018 +0300
comctl32/tests: Fix a test failure under Windows 7.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/tests/misc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index 85f339b..5e91a80 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -265,8 +265,7 @@ static void test_LoadIconWithScaleDown(void)
/* non-existing filename */
hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon);
- todo_wine
- ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND),
+ ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win7 */,
"Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr);
hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon);
More information about the wine-cvs
mailing list