wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Christian Costa : amstream: Add IAMMediaStream interface to AudioMediaStream object.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: e8c256b185fe07bcc835c58a26186839f5acd11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c256b185fe07bcc835c58a2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:48 2012 +0200 amstream: Add IAMMediaStream interface to AudioMediaStream object. --- dlls/amstream/mediastream.c | 203 +++++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 202 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0657893..dd037fc 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -455,6 +455,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ } typedef struct { + IAMMediaStream IAMMediaStream_iface; IAudioMediaStream IAudioMediaStream_iface; LONG ref; IMultiMediaStream* parent; @@ -462,6 +463,194 @@ typedef struct { STREAM_TYPE stream_type; } AudioMediaStreamImpl; +static inline AudioMediaStreamImpl *impl_from_AudioMediaStream_IAMMediaStream(IAMMediaStream *iface) +{ + return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAMMediaStream_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMediaStream *iface, + REFIID riid, void **ret_iface) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMediaStream) || + IsEqualGUID(riid, &IID_IAMMediaStream)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IAudioMediaStream)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = &This->IAudioMediaStream_iface; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_AddRef(IAMMediaStream *iface) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + + return ref; +} + +static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream *iface) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IMediaStream methods ***/ +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, + IMultiMediaStream** multi_media_stream) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, + MSPID *purpose_id, STREAM_TYPE *type) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); + + if (purpose_id) + *purpose_id = This->purpose_id; + if (type) + *type = This->stream_type; + + return S_OK; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetSameFormat(IAMMediaStream *iface, + IMediaStream *pStreamThatHasDesiredFormat, DWORD flags) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_AllocateSample(IAMMediaStream *iface, + DWORD flags, IStreamSample **sample) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample(IAMMediaStream *iface, + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, existing_sample, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface, DWORD flags) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%x) stub!\n", This, iface, flags); + + return S_FALSE; +} + +/*** IAMMediaStream methods ***/ +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, + REFMSPID purpose_id, const STREAM_TYPE stream_type) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *am_multi_media_stream) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *media_stream_filter) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, media_stream_filter); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + + return S_FALSE; +} + +static const struct IAMMediaStreamVtbl AudioMediaStreamImpl_IAMMediaStream_Vtbl = +{ + /*** IUnknown methods ***/ + AudioMediaStreamImpl_IAMMediaStream_QueryInterface, + AudioMediaStreamImpl_IAMMediaStream_AddRef, + AudioMediaStreamImpl_IAMMediaStream_Release, + /*** IMediaStream methods ***/ + AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream, + AudioMediaStreamImpl_IAMMediaStream_GetInformation, + AudioMediaStreamImpl_IAMMediaStream_SetSameFormat, + AudioMediaStreamImpl_IAMMediaStream_AllocateSample, + AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample, + AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream, + /*** IAMMediaStream methods ***/ + AudioMediaStreamImpl_IAMMediaStream_Initialize, + AudioMediaStreamImpl_IAMMediaStream_SetState, + AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream, + AudioMediaStreamImpl_IAMMediaStream_JoinFilter, + AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph +}; + static inline AudioMediaStreamImpl *impl_from_IAudioMediaStream(IAudioMediaStream *iface) { return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAudioMediaStream_iface); @@ -483,6 +672,13 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAud *ret_iface = iface; return S_OK; } + else if (IsEqualGUID(riid, &IID_IAMMediaStream)) + { + IAudioMediaStream_AddRef(iface); + *ret_iface = &This->IAMMediaStream_iface; + return S_OK; + } + *ret_iface = NULL; @@ -615,7 +811,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSample(IAudio return audiostreamsample_create(iface, audio_data, sample); } -static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_AudioMediaStream_Vtbl = +static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_IAudioMediaStream_Vtbl = { /*** IUnknown methods ***/ AudioMediaStreamImpl_IAudioMediaStream_QueryInterface, @@ -648,14 +844,15 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ return E_OUTOFMEMORY; } - object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_AudioMediaStream_Vtbl; + object->IAMMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAMMediaStream_Vtbl; + object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAudioMediaStream_Vtbl; object->ref = 1; object->parent = parent; object->purpose_id = *purpose_id; object->stream_type = stream_type; - *media_stream = (IMediaStream*)&object->IAudioMediaStream_iface; + *media_stream = (IMediaStream*)&object->IAMMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index fa9d0e4..6a198e0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -326,8 +326,8 @@ static void test_media_streams(void) IAudioStreamSample *audio_sample = NULL; hr = IMediaStream_QueryInterface(audio_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); - todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); - todo_wine ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, audio_stream); if (hr == S_OK) IAMMediaStream_Release(am_media_stream);

1 0

Christian Costa : amstream: Add IAMMediaStream interface to DirectDrawMediaStream object.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 6b73c61c63aec72f2635f4b1080693e623d2bb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b73c61c63aec72f2635f4b10… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:40 2012 +0200 amstream: Add IAMMediaStream interface to DirectDrawMediaStream object. --- dlls/amstream/mediastream.c | 236 ++++++++++++++++++++++++++++++++++++---- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 218 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b73c61c63aec72f2635f…

1 0

Christian Costa : amstream: Rename media stream objects and their method names for multi interfaces support .
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: b74bcb61f9fa97c0c7179996b56c070778bd73c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74bcb61f9fa97c0c7179996b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:31 2012 +0200 amstream: Rename media stream objects and their method names for multi interfaces support. --- dlls/amstream/mediastream.c | 178 +++++++++++++++++++++--------------------- 1 files changed, 89 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b74bcb61f9fa97c0c7179…

1 0

Henri Verbeet : wined3d: Take the data type of immediates into account in shader_glsl_get_register_name ().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: eb4d20ef3181c42741bad790e4ac87fa39f0b6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d20ef3181c42741bad790e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:49 2012 +0200 wined3d: Take the data type of immediates into account in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5c0cdfb..14d165b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1478,13 +1478,49 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + switch (reg->data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + break; + case WINED3D_DATA_INT: + sprintf(register_name, "%#x", reg->immconst_data[0]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(register_name, "%#xu", reg->immconst_data[0]); + break; + default: + sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + break; + } break; case WINED3D_IMMCONST_VEC4: - sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], - *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + switch (reg->data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + break; + case WINED3D_DATA_INT: + sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + break; + default: + sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + break; + } break; default:

1 0

Henri Verbeet : wined3d: Just return the shader from wined3d_device_get_vertex_shader().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 6909b5143be25cfc4f29e1436d2049addeb1f86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6909b5143be25cfc4f29e1436… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:48 2012 +0200 wined3d: Just return the shader from wined3d_device_get_vertex_shader(). --- dlls/d3d8/device.c | 10 +++------- dlls/d3d9/device.c | 4 +--- dlls/wined3d/device.c | 9 +-------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5325a6d..709ac52 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2174,7 +2174,6 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertex_shader *shader_impl; - struct wined3d_shader *cur; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2187,12 +2186,9 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW return D3DERR_INVALIDCALL; } - if ((cur = wined3d_device_get_vertex_shader(device->wined3d_device))) - { - if (cur == shader_impl->wined3d_shader) - IDirect3DDevice8_SetVertexShader(iface, 0); - wined3d_shader_decref(cur); - } + if (shader_impl->wined3d_shader + && wined3d_device_get_vertex_shader(device->wined3d_device) == shader_impl->wined3d_shader) + IDirect3DDevice8_SetVertexShader(iface, 0); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5a17943..0418d69 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2286,13 +2286,11 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device); - if (wined3d_shader) + if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface; IDirect3DVertexShader9_AddRef(*shader); - wined3d_shader_decref(wined3d_shader); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2cf0f85..664f1bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2480,16 +2480,9 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) { - struct wined3d_shader *shader; - TRACE("device %p.\n", device); - shader = device->stateBlock->state.vertex_shader; - if (shader) - wined3d_shader_incref(shader); - - TRACE("Returning %p.\n", shader); - return shader; + return device->stateBlock->state.vertex_shader; } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: wined3d_device_set_vertex_shader() never fails.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: b97ec7ae0c603eb9a4e54778eb643f4adce90aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97ec7ae0c603eb9a4e54778e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:47 2012 +0200 wined3d: wined3d_device_set_vertex_shader() never fails. --- dlls/d3d8/device.c | 7 ++----- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 22 ++++++++-------------- include/wine/wined3d.h | 2 +- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index baa8b63..5325a6d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2110,7 +2110,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertex_shader *shader_impl; - HRESULT hr; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2140,12 +2139,10 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD wined3d_device_set_vertex_declaration(device->wined3d_device, shader_impl->vertex_declaration->wined3d_vertex_declaration); - hr = wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); - TRACE("Returning hr %#x\n", hr); - - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetVertexShader(IDirect3DDevice8 *iface, DWORD *shader) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b1b7b80..5a17943 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2266,16 +2266,15 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexshader *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_shader(device->wined3d_device, + wined3d_device_set_vertex_shader(device->wined3d_device, shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b63104..2cf0f85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2449,39 +2449,33 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( return device->stateBlock->state.vertex_declaration; } -HRESULT CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) +void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->updateStateBlock->state.vertex_shader; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (prev) + wined3d_shader_decref(prev); + device->updateStateBlock->state.vertex_shader = shader; device->updateStateBlock->changed.vertexShader = TRUE; if (device->isRecordingState) { - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } if (shader == prev) { TRACE("Application is setting the old shader over, nothing to do.\n"); - return WINED3D_OK; + return; } - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - device_invalidate_state(device, STATE_VSHADER); - - return WINED3D_OK; } struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bf16b55..3a87b25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2236,7 +2236,7 @@ void __cdecl wined3d_device_set_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration); -HRESULT __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count);

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetPixelShader().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 1dcc63c170742d813f8685f4c3e850c9b1058ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcc63c170742d813f8685f4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:46 2012 +0200 d3d10: Implement d3d10_effect_shader_variable_GetPixelShader(). --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 902bf5a..edb216b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5665,9 +5665,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { - FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_shader_variable *s; - return E_NOTIMPL; + TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_PIXELSHADER) + { + WARN("Shader is not a pixel shader.\n"); + return E_FAIL; + } + + s = v->data; + if ((*shader = s->shader.ps)) + ID3D10PixelShader_AddRef(*shader); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureElementDesc(

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetGeometryShader().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 90df33f0b3be029c442da4125ba9579aa4c0939f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90df33f0b3be029c442da4125… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:45 2012 +0200 d3d10: Implement d3d10_effect_shader_variable_GetGeometryShader(). --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0d8bd0e..902bf5a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5641,9 +5641,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10GeometryShader **shader) { - FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_shader_variable *s; - return E_NOTIMPL; + TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_GEOMETRYSHADER) + { + WARN("Shader is not a geometry shader.\n"); + return E_FAIL; + } + + s = v->data; + if ((*shader = s->shader.gs)) + ID3D10GeometryShader_AddRef(*shader); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader(

1 0

Jacek Caban : jscript: Fixed conversion in place in IVariantChangeType:: ChangeType.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: c0d2029560372974001f75acbbaebda54473a51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d2029560372974001f75acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 18:00:33 2012 +0200 jscript: Fixed conversion in place in IVariantChangeType::ChangeType. --- dlls/jscript/jscript.c | 14 +++++++++++--- dlls/jscript/tests/caller.c | 10 ++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9704e4e..e38987c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1007,20 +1007,28 @@ static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) { JScript *This = impl_from_IVariantChangeType(iface); + VARIANT res; HRESULT hres; - TRACE("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + TRACE("(%p)->(%p %p%s %x %d)\n", This, dst, src, debugstr_variant(src), lcid, vt); if(!This->ctx) { FIXME("Object uninitialized\n"); return E_UNEXPECTED; } - hres = VariantClear(dst); + hres = variant_change_type(This->ctx, &res, src, vt); if(FAILED(hres)) return hres; - return variant_change_type(This->ctx, dst, src, vt); + hres = VariantClear(dst); + if(FAILED(hres)) { + VariantClear(&res); + return hres; + } + + *dst = res; + return S_OK; } static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 6fef7f1..f09ad90 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -168,6 +168,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_disp) { VARIANT v, dst; + BSTR str; HRESULT hres; static const conv_results_t bool_results[] = { @@ -214,6 +215,15 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di hres = IVariantChangeType_ChangeType(change_type, &dst, &v, 0, VT_I4); ok(hres == DISP_E_BADVARTYPE, "ChangeType failed: %08x, expected DISP_E_BADVARTYPE\n", hres); ok(V_VT(&dst) == 0xdead, "V_VT(dst) = %d\n", V_VT(&dst)); + + /* Test conversion in place */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = str = a2bstr("test"); + hres = IVariantChangeType_ChangeType(change_type, &v, &v, 0, VT_BSTR); + ok(hres == S_OK, "ChangeType failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BSTR(&v) != str, "V_BSTR(v) == str\n"); + ok(!strcmp_wa(V_BSTR(&v), "test"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); } static void test_caller(IServiceProvider *caller, IDispatch *arg_obj)

1 0

Michael Stefaniuc : shell32/tests: Use the explicit type for a function pointer.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 5c02bc11e102a41236a8477f42ff583e09fc269f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02bc11e102a41236a8477f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 21 17:52:51 2012 +0200 shell32/tests: Use the explicit type for a function pointer. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ec96ed3..5130240 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1802,7 +1802,7 @@ static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) * by changing the entry for WaitForInputIdle() in the shell32 import address * table. */ -static void hook_WaitForInputIdle(void *new_func) +static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) { char *base; PIMAGE_NT_HEADERS nt_headers; @@ -1867,7 +1867,7 @@ static void test_dde(void) HANDLE map; char *shared_block; - hook_WaitForInputIdle((void *) hooked_WaitForInputIdle); + hook_WaitForInputIdle(hooked_WaitForInputIdle); sprintf(filename, "%s\\test file.sde", tmpdir);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012