Nikolay Sivov : propsys: Fix negative numeric source handling in PropVariantToBoolean().
Alexandre Julliard
julliard at winehq.org
Mon Sep 25 16:34:31 CDT 2017
Module: wine
Branch: master
Commit: 3b18054f258bd05f3f5f0094c3fce54a04c4cc83
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b18054f258bd05f3f5f0094c3fce54a04c4cc83
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun Sep 24 12:00:08 2017 +0300
propsys: Fix negative numeric source handling in PropVariantToBoolean().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/propsys/propvar.c | 2 +-
dlls/propsys/tests/propsys.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c
index bdf9226..3e3b502 100644
--- a/dlls/propsys/propvar.c
+++ b/dlls/propsys/propvar.c
@@ -282,7 +282,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret)
break;
}
- hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res);
*ret = !!res;
return hr;
}
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index ce1ee71..327c606 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -956,7 +956,6 @@ static void test_PropVariantToBoolean(void)
propvar.u.lVal = -67;
val = FALSE;
hr = PropVariantToBoolean(&propvar, &val);
-todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(val == TRUE, "Unexpected value %d\n", val);
@@ -986,7 +985,6 @@ todo_wine
propvar.u.pwszVal = str_n7;
val = FALSE;
hr = PropVariantToBoolean(&propvar, &val);
-todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(val == TRUE, "Unexpected value %d\n", val);
@@ -1092,7 +1090,6 @@ todo_wine
propvar.vt = VT_LPSTR;
propvar.u.pszVal = (char *)"-1";
hr = PropVariantToBoolean(&propvar, &val);
-todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(val == TRUE, "Unexpected value %d\n", val);
}
More information about the wine-cvs
mailing list