From 8004c858f3c7de9c91d1e72e2c114524266d3b01 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 17 Nov 2016 22:47:02 +0000 Subject: [PATCH] [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 svn path=/trunk/; revision=73277 --- rostests/winetests/mmdevapi/capture.c | 10 ++-------- rostests/winetests/mmdevapi/propstore.c | 7 ++++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/rostests/winetests/mmdevapi/capture.c b/rostests/winetests/mmdevapi/capture.c index 749272aa139..99da296e0ad 100644 --- a/rostests/winetests/mmdevapi/capture.c +++ b/rostests/winetests/mmdevapi/capture.c @@ -309,19 +309,13 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { /* FIXME: Some drivers fail */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); - }else{ ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); diff --git a/rostests/winetests/mmdevapi/propstore.c b/rostests/winetests/mmdevapi/propstore.c index 665136f7d40..02340ba1f65 100644 --- a/rostests/winetests/mmdevapi/propstore.c +++ b/rostests/winetests/mmdevapi/propstore.c @@ -64,7 +64,7 @@ static void test_propertystore(IPropertyStore *store) 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_EMPTY, "Key should not be found\n"); + ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); @@ -118,8 +118,9 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); - ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); + ok(found_name || + broken(!found_name) /* vista */, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); } static void test_setvalue_on_wow64(IPropertyStore *store) -- 2.17.1