https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8949b0daddf13c383b6abea216fe9df30de9a34
commit b8949b0daddf13c383b6abea216fe9df30de9a34 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Nov 9 21:55:28 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Nov 9 21:55:28 2019 +0100 [MMDEVAPI_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/mmdevapi/propstore.c | 9 ++++++--- modules/rostests/winetests/mmdevapi/render.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/mmdevapi/propstore.c b/modules/rostests/winetests/mmdevapi/propstore.c index 02340ba1f65..bdba19d158c 100644 --- a/modules/rostests/winetests/mmdevapi/propstore.c +++ b/modules/rostests/winetests/mmdevapi/propstore.c @@ -58,23 +58,26 @@ static void test_propertystore(IPropertyStore *store) { WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); trace("guid: %s\n", temp); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); } static void test_deviceinterface(IPropertyStore *store) @@ -91,7 +94,7 @@ static void test_deviceinterface(IPropertyStore *store) ok(hr == S_OK, "GetValue failed: %08x\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } static void test_getat(IPropertyStore *store) @@ -108,7 +111,7 @@ static void test_getat(IPropertyStore *store) hr = IPropertyStore_GetCount(store, &propcount); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(propcount > 0, "Propcount %d should be greather than zero\n", propcount); + ok(propcount > 0, "Propcount %d should be greater than zero\n", propcount); for (prop = 0; prop < propcount; prop++) { hr = IPropertyStore_GetAt(store, prop, &pkey); diff --git a/modules/rostests/winetests/mmdevapi/render.c b/modules/rostests/winetests/mmdevapi/render.c index 7f43eae9e73..3e8fd4a0c65 100644 --- a/modules/rostests/winetests/mmdevapi/render.c +++ b/modules/rostests/winetests/mmdevapi/render.c @@ -747,7 +747,7 @@ static void test_padding(void) /* win10 appears not to clear the buffer */ for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ if(buf[i] != silence){ - ok(0, "buffer has data in it already, i: %u, valu: %f\n", i, *((float*)buf)); + ok(0, "buffer has data in it already, i: %u, value: %f\n", i, *((float*)buf)); break; } }
