From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/propsys/propvar.c | 4 ++++ dlls/propsys/tests/propsys.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ba6a2eca865..aa71a26feaa 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -424,6 +424,9 @@ static HRESULT string_alloc_from_int(const PROPVARIANT *var, WCHAR **ret) case VT_UI2: value = var->uiVal; break; + case VT_UI4: + value = var->ulVal; + break; default: return E_UNEXPECTED; } @@ -503,6 +506,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) case VT_I4: case VT_UI1: case VT_UI2: + case VT_UI4: hr = string_alloc_from_int(propvarIn, &res); break;
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 5cc93d05c56..31218a42583 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1690,9 +1690,7 @@ static void test_PropVariantToString(void) propvar.vt = VT_UI4; propvar.lVal = 123456; hr = PropVariantToString(&propvar, bufferW, 4); - todo_wine ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString returned: %#lx.\n", hr); - todo_wine ok(!wcscmp(bufferW, L"123"), "Unexpected string %s.\n", debugstr_w(bufferW)); memset(bufferW, 0, sizeof(bufferW));
@@ -1767,7 +1765,6 @@ static void test_PropVariantToBSTR(void) todo_wine { check_PropVariantToBSTR(VT_I8, hVal.QuadPart, -101112, L"-101112"); - check_PropVariantToBSTR(VT_UI4, ulVal, 0xdeadbeef, L"3735928559"); check_PropVariantToBSTR(VT_UI8, uhVal.QuadPart, 0xdeadbeefdeadbeef, L"16045690984833335023"); check_PropVariantToBSTR(VT_BOOL, boolVal, TRUE, L"1"); check_PropVariantToBSTR(VT_R4, fltVal, 0.125f, L"0.125"); @@ -1778,6 +1775,7 @@ static void test_PropVariantToBSTR(void) check_PropVariantToBSTR(VT_I4, lVal, -789, L"-789"); check_PropVariantToBSTR(VT_UI1, bVal, 205, L"205"); check_PropVariantToBSTR(VT_UI2, uiVal, 57005, L"57005"); + check_PropVariantToBSTR(VT_UI4, ulVal, 0xdeadbeef, L"3735928559"); check_PropVariantToBSTR(VT_CLSID, puuid, (CLSID *)&dummy_guid, dummy_guid_str); check_PropVariantToBSTR(VT_LPSTR, pszVal, (char *)topic, topicW); check_PropVariantToBSTR(VT_LPWSTR, pwszVal, (WCHAR *)topicW, topicW);