July 2017 - Wine-Devel - list.winehq.org

Re: [2/2] vcomp/tests: Test more arguments with a callback

by Sebastian Lackner

On 05.07.2017 21:23, André Hentschel wrote: > - p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), > - (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); > + p_vcomp_fork(TRUE, 12, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), > + (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5, > + (UINT_PTR)6, (UINT_PTR)7, (UINT_PTR)8, (UINT_PTR)9, > + (UINT_PTR)10, (UINT_PTR)11); Shouldn't the second argument be 11?

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Matteo Bruni

2017-07-05 20:00 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > On 07/05/2017 08:55 PM, Matteo Bruni wrote: >> >> 2017-07-05 19:45 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >>> >>> On 07/05/2017 08:40 PM, Paul Gofman wrote: >>>> >>>> On 07/05/2017 08:29 PM, Matteo Bruni wrote: >>>>> >>>>> 2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >>>>> >>>>> Sorry for the delayed reviews. I did it at last... >>>>> >>>>>> #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ >>>>>> @@ -4505,12 +4551,38 @@ static void >>>>>> test_effect_preshader(IDirect3DDevice9 *device) >>>>>> hr = IDirect3DDevice9_GetSamplerState(device, 0, >>>>>> D3DSAMP_MAGFILTER, &value); >>>>>> ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>>>> todo_wine ok(value == 3, "Unexpected sampler 0 magfilter >>>>>> %u.\n", >>>>>> value); >>>>>> + >>>>>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, >>>>>> D3DSAMP_MINFILTER, >>>>>> &value); >>>>>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>>>> + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); >>>>>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, >>>>>> D3DSAMP_MAGFILTER, >>>>>> &value); >>>>>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>>>> + todo_wine >>>>>> + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); >>>>> >>>>> Not new or really related to this patch: any idea about what's going >>>>> on with the magfilter state computation? I didn't really look into it, >>>>> does >>>>> it have to do with default parameter values by any chance? >>>>> >>>>> >>>> It needs type casting, the output table for FXLC is always float, but >>>> the >>>> input for state is integer, thus an enormous value failing the test. I >>>> was >>>> thinking of adding type specifier to state table in effect.c and doing >>>> the >>>> cast, but did not come to that yet. >>>> >>> More exactly, the state parameter in sampler state is float for FXLC >>> constants for some reason (which is not the case for "normal" states, >>> which >>> are assigned ok). Maybe it should be set to correct type during the parse >>> actually. >> >> Maybe FXLC preshaders are always supposed to output float, with the >> optional conversion after the fact. Not sure it makes any difference >> in practice. >> > Yes, sure, but the output of FXLC preshader is actually converted to the > type which is specified in state parameter which holds FXLC. That works fine > for "top level" states, but for some reason the type of FXLC state parameter > for sampler is float in the test case. Doesn't it come from the effect itself though? Converting the state parameter value to the actual state type would match a tiny bit better with what the effect specifies, for what it might be worth. It probably won't make any practical difference either way you go, the additional type field in state_table[] should mostly be it in any case.

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Paul Gofman

On 07/05/2017 08:55 PM, Matteo Bruni wrote: > 2017-07-05 19:45 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >> On 07/05/2017 08:40 PM, Paul Gofman wrote: >>> On 07/05/2017 08:29 PM, Matteo Bruni wrote: >>>> 2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >>>> >>>> Sorry for the delayed reviews. I did it at last... >>>> >>>>> #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ >>>>> @@ -4505,12 +4551,38 @@ static void >>>>> test_effect_preshader(IDirect3DDevice9 *device) >>>>> hr = IDirect3DDevice9_GetSamplerState(device, 0, >>>>> D3DSAMP_MAGFILTER, &value); >>>>> ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>>> todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", >>>>> value); >>>>> + >>>>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, >>>>> &value); >>>>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>>> + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); >>>>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, >>>>> &value); >>>>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>>> + todo_wine >>>>> + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); >>>> Not new or really related to this patch: any idea about what's going >>>> on with the magfilter state computation? I didn't really look into it, >>>> does >>>> it have to do with default parameter values by any chance? >>>> >>>> >>> It needs type casting, the output table for FXLC is always float, but the >>> input for state is integer, thus an enormous value failing the test. I was >>> thinking of adding type specifier to state table in effect.c and doing the >>> cast, but did not come to that yet. >>> >> More exactly, the state parameter in sampler state is float for FXLC >> constants for some reason (which is not the case for "normal" states, which >> are assigned ok). Maybe it should be set to correct type during the parse >> actually. > Maybe FXLC preshaders are always supposed to output float, with the > optional conversion after the fact. Not sure it makes any difference > in practice. > Yes, sure, but the output of FXLC preshader is actually converted to the type which is specified in state parameter which holds FXLC. That works fine for "top level" states, but for some reason the type of FXLC state parameter for sampler is float in the test case.

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Matteo Bruni

2017-07-05 19:45 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > On 07/05/2017 08:40 PM, Paul Gofman wrote: >> >> On 07/05/2017 08:29 PM, Matteo Bruni wrote: >>> >>> 2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >>> >>> Sorry for the delayed reviews. I did it at last... >>> >>>> #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ >>>> @@ -4505,12 +4551,38 @@ static void >>>> test_effect_preshader(IDirect3DDevice9 *device) >>>> hr = IDirect3DDevice9_GetSamplerState(device, 0, >>>> D3DSAMP_MAGFILTER, &value); >>>> ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>> todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", >>>> value); >>>> + >>>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, >>>> &value); >>>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>> + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); >>>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, >>>> &value); >>>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>>> + todo_wine >>>> + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); >>> >>> Not new or really related to this patch: any idea about what's going >>> on with the magfilter state computation? I didn't really look into it, >>> does >>> it have to do with default parameter values by any chance? >>> >>> >> It needs type casting, the output table for FXLC is always float, but the >> input for state is integer, thus an enormous value failing the test. I was >> thinking of adding type specifier to state table in effect.c and doing the >> cast, but did not come to that yet. >> > More exactly, the state parameter in sampler state is float for FXLC > constants for some reason (which is not the case for "normal" states, which > are assigned ok). Maybe it should be set to correct type during the parse > actually. Maybe FXLC preshaders are always supposed to output float, with the optional conversion after the fact. Not sure it makes any difference in practice.

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Paul Gofman

On 07/05/2017 08:40 PM, Paul Gofman wrote: > On 07/05/2017 08:29 PM, Matteo Bruni wrote: >> 2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >> >> Sorry for the delayed reviews. I did it at last... >> >>> #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ >>> @@ -4505,12 +4551,38 @@ static void >>> test_effect_preshader(IDirect3DDevice9 *device) >>> hr = IDirect3DDevice9_GetSamplerState(device, 0, >>> D3DSAMP_MAGFILTER, &value); >>> ok(hr == D3D_OK, "Got result %#x.\n", hr); >>> todo_wine ok(value == 3, "Unexpected sampler 0 magfilter >>> %u.\n", value); >>> + >>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, >>> D3DSAMP_MINFILTER, &value); >>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>> + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); >>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, >>> D3DSAMP_MAGFILTER, &value); >>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>> + todo_wine >>> + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); >> Not new or really related to this patch: any idea about what's going >> on with the magfilter state computation? I didn't really look into >> it, does >> it have to do with default parameter values by any chance? >> >> > It needs type casting, the output table for FXLC is always float, but > the input for state is integer, thus an enormous value failing the > test. I was thinking of adding type specifier to state table in > effect.c and doing the cast, but did not come to that yet. > More exactly, the state parameter in sampler state is float for FXLC constants for some reason (which is not the case for "normal" states, which are assigned ok). Maybe it should be set to correct type during the parse actually.

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Matteo Bruni

2017-07-05 19:40 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > On 07/05/2017 08:29 PM, Matteo Bruni wrote: >> >> 2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: >> >> Sorry for the delayed reviews. I did it at last... >> >>> #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ >>> @@ -4505,12 +4551,38 @@ static void >>> test_effect_preshader(IDirect3DDevice9 *device) >>> hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, >>> &value); >>> ok(hr == D3D_OK, "Got result %#x.\n", hr); >>> todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", >>> value); >>> + >>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, >>> &value); >>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>> + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); >>> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, >>> &value); >>> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >>> + todo_wine >>> + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); >> >> Not new or really related to this patch: any idea about what's going >> on with the magfilter state computation? I didn't really look into it, >> does >> it have to do with default parameter values by any chance? >> >> > It needs type casting, the output table for FXLC is always float, but the > input for state is integer, thus an enormous value failing the test. I was > thinking of adding type specifier to state table in effect.c and doing the > cast, but did not come to that yet. Ah, cool. Yes, that sounds good.

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Paul Gofman

On 07/05/2017 08:29 PM, Matteo Bruni wrote: > 2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > > Sorry for the delayed reviews. I did it at last... > >> #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ >> @@ -4505,12 +4551,38 @@ static void test_effect_preshader(IDirect3DDevice9 *device) >> hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, &value); >> ok(hr == D3D_OK, "Got result %#x.\n", hr); >> todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", value); >> + >> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, &value); >> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >> + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); >> + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, &value); >> + ok(hr == D3D_OK, "Got result %#x.\n", hr); >> + todo_wine >> + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); > Not new or really related to this patch: any idea about what's going > on with the magfilter state computation? I didn't really look into it, does > it have to do with default parameter values by any chance? > > It needs type casting, the output table for FXLC is always float, but the input for state is integer, thus an enormous value failing the test. I was thinking of adding type specifier to state table in effect.c and doing the cast, but did not come to that yet.

July 5, 2017

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.

by Matteo Bruni

2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: Sorry for the delayed reviews. I did it at last... > #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ > @@ -4505,12 +4551,38 @@ static void test_effect_preshader(IDirect3DDevice9 *device) > hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, &value); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, &value); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, &value); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine > + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); Not new or really related to this patch: any idea about what's going on with the magfilter state computation? I didn't really look into it, does it have to do with default parameter values by any chance?

July 5, 2017

Re: [PATCH] dmime: Rename IPersistStreamImpl_Load functions

by Michael Stefaniuc

Hello Alistair, On 07/05/2017 08:17 AM, Alistair Leslie-Hughes wrote: > When a log had IPersistStreamImpl_Load entry from dmime, it's > quiet confusing to which of the _Load function was used. could you please change the "persist_stream" part of the new name to "IPersistStream"? That way it is consistent with the other method names. thanks bye michael > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dmime/lyricstrack.c | 4 ++-- > dlls/dmime/markertrack.c | 4 ++-- > dlls/dmime/paramcontroltrack.c | 4 ++-- > dlls/dmime/segment.c | 4 ++-- > dlls/dmime/segtriggertrack.c | 4 ++-- > dlls/dmime/seqtrack.c | 4 ++-- > dlls/dmime/sysextrack.c | 4 ++-- > dlls/dmime/tempotrack.c | 4 ++-- > dlls/dmime/timesigtrack.c | 4 ++-- > dlls/dmime/wavetrack.c | 4 ++-- > 10 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c > index 70382735d5..66293526dc 100644 > --- a/dlls/dmime/lyricstrack.c > +++ b/dlls/dmime/lyricstrack.c > @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI lyrics_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + lyrics_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c > index 852948ab40..0fe72f9c91 100644 > --- a/dlls/dmime/markertrack.c > +++ b/dlls/dmime/markertrack.c > @@ -188,7 +188,7 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { > IDirectMusicTrackImpl_Clone > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI marker_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -200,7 +200,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + marker_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c > index affea1da90..a7bc873c97 100644 > --- a/dlls/dmime/paramcontroltrack.c > +++ b/dlls/dmime/paramcontroltrack.c > @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI param_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + param_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c > index ad8561fcae..be4a850556 100644 > --- a/dlls/dmime/segment.c > +++ b/dlls/dmime/segment.c > @@ -1171,7 +1171,7 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream > return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI seg_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); > HRESULT hr; > @@ -1248,7 +1248,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + seg_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c > index d1b208a6d0..17d5da2db5 100644 > --- a/dlls/dmime/segtriggertrack.c > +++ b/dlls/dmime/segtriggertrack.c > @@ -456,7 +456,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre > return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI trigger_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); > DMUS_PRIVATE_CHUNK Chunk; > @@ -505,7 +505,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + trigger_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c > index 2d80db75cd..7e74fa6036 100644 > --- a/dlls/dmime/seqtrack.c > +++ b/dlls/dmime/seqtrack.c > @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI track_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + track_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c > index 431fca7227..ba7a8fdc7c 100644 > --- a/dlls/dmime/sysextrack.c > +++ b/dlls/dmime/sysextrack.c > @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI sys_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + sys_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c > index 70de44228f..3c6f957571 100644 > --- a/dlls/dmime/tempotrack.c > +++ b/dlls/dmime/tempotrack.c > @@ -320,7 +320,7 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i > return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI tempo_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); > DMUS_PRIVATE_CHUNK Chunk; > @@ -375,7 +375,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + tempo_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c > index 9bd7450264..72fdac8cbe 100644 > --- a/dlls/dmime/timesigtrack.c > +++ b/dlls/dmime/timesigtrack.c > @@ -189,7 +189,7 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { > IDirectMusicTrackImpl_Clone > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI time_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -201,7 +201,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + time_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c > index bc6e3ca413..20656a9362 100644 > --- a/dlls/dmime/wavetrack.c > +++ b/dlls/dmime/wavetrack.c > @@ -249,7 +249,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI wave_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -261,7 +261,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + wave_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; >

July 5, 2017

Re: [PATCH] mmdevapi/tests: Use standard wine_dbgstr_longlong.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=32062 Your paranoid android. === w7u (32 bit render) === render.c:1029: Test failed: Position 6592 too far after playing 100ms === w864 (32 bit render) === render.c:1255: Test failed: GetBuffer large (20671) at iteration 2

July 5, 2017