December 2010 - Wine-commits

Maarten Lankhorst : quartz: Handle seeking while running better.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: b353f32453da4bfe6aaccbb9effef48e7ae679ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b353f32453da4bfe6aaccbb9e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:55 2010 +0100 quartz: Handle seeking while running better. --- dlls/quartz/filtergraph.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 50a045e..05b6e47 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2471,17 +2471,18 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Stop position not handled yet!\n"); + if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) + IMediaControl_Pause((IMediaControl*)&This->IMediaControl_vtbl); args.current = pCurrent; args.stop = pStop; args.curflags = dwCurrentFlags; args.stopflags = dwStopFlags; hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); - if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) { - if (This->state == State_Running) - FIXME("Seeking while graph is running is not properly supported!\n"); + if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) This->pause_time = This->start_time = -1; - } + if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) + IMediaControl_Run((IMediaControl*)&This->IMediaControl_vtbl); LeaveCriticalSection(&This->cs); return hr;

1 0

Maarten Lankhorst : quartz: Fix a race condition in videorenderer endflush.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 351165e30dd5afc67a9fa53cdd5aac9b07a1a910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351165e30dd5afc67a9fa53cd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:56 2010 +0100 quartz: Fix a race condition in videorenderer endflush. --- dlls/quartz/videorenderer.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6f2a860..86b9f2a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -432,6 +432,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS LeaveCriticalSection(&This->filter.csFilter); WaitForSingleObject(This->blocked, INFINITE); EnterCriticalSection(&This->filter.csFilter); + SetEvent(This->hEvent); This->sample_held = NULL; if (This->filter.state == State_Paused) { @@ -959,6 +960,15 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(This->pin.pCritSec); + + if (pVideoRenderer->sample_held) { + SetEvent(pVideoRenderer->blocked); + ResetEvent(pVideoRenderer->hEvent); + LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(pVideoRenderer->hEvent, INFINITE); + EnterCriticalSection(This->pin.pCritSec); + ResetEvent(pVideoRenderer->blocked); + } if (pVideoRenderer->filter.state == State_Paused) { ResetEvent(pVideoRenderer->blocked); ResetEvent(pVideoRenderer->hEvent);

1 0

Maarten Lankhorst : quartz: Handle EndOfStream more elegantly in dsound renderer.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 220d610b3da682c75343f07bed0688a7affd5801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220d610b3da682c75343f07be… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:57 2010 +0100 quartz: Handle EndOfStream more elegantly in dsound renderer. --- dlls/quartz/dsoundrender.c | 47 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 975eee1..f48cc77 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -226,6 +226,42 @@ end: return S_OK; } +static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) +{ + HRESULT hr; + IMediaEventSink *pEventSink; + + while (1) + { + DWORD pos1, pos2; + DSoundRender_UpdatePositions(This, &pos1, &pos2); + if (pos1 == pos2) + break; + + This->in_loop = 1; + LeaveCriticalSection(&This->filter.csFilter); + WaitForSingleObject(This->blocked, 10); + EnterCriticalSection(&This->filter.csFilter); + This->in_loop = 0; + if (This->pInputPin->flushing || + This->filter.state != State_Running) { + SetEvent(This->state_change); + return S_FALSE; + } + } + + if (!This->filter.filterInfo.pGraph) + return S_OK; + + hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); + IMediaEventSink_Release(pEventSink); + } + return hr; +} + static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, const BYTE *data, DWORD size) { HRESULT hr; @@ -875,7 +911,6 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = (BaseInputPin*)iface; DSoundRenderImpl *me = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; - IMediaEventSink* pEventSink; HRESULT hr; EnterCriticalSection(This->pin.pCritSec); @@ -889,15 +924,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) return hr; } - if (me->filter.filterInfo.pGraph) - { - hr = IFilterGraph_QueryInterface(me->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)me); - IMediaEventSink_Release(pEventSink); - } - } + hr = DSoundRender_HandleEndOfStream(me); MediaSeekingPassThru_EOS(me->seekthru_unk); SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec);

1 0

Maarten Lankhorst : winegstreamer: Silence a harmless fixme.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: ea397d25994bf7b9ead8a920ce6588d42b3e8e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea397d25994bf7b9ead8a920c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:58 2010 +0100 winegstreamer: Silence a harmless fixme. --- dlls/winegstreamer/gstdemux.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7b1c989..41190ec 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -360,7 +360,9 @@ static gboolean event_src(GstPad *pad, GstEvent *event) { LeaveCriticalSection(&This->filter.csFilter); break; default: - FIXME("%p stub\n", event); + FIXME("%p (%u) stub\n", event, event->type); + case GST_EVENT_TAG: + case GST_EVENT_QOS: return gst_pad_event_default(pad, event); } return 1;

1 0

Maarten Lankhorst : winegstreamer: Correct a state transition.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 9ef5a863e395df8b37a6f562c03fd35ce10dd155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef5a863e395df8b37a6f562c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:59 2010 +0100 winegstreamer: Correct a state transition. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41190ec..46cd9ec 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1190,7 +1190,7 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { return S_OK; if (now == GST_STATE_PAUSED) { GstStateChangeReturn ret; - ret = gst_element_set_state(This->gstfilter, GST_STATE_PAUSED); + ret = gst_element_set_state(This->gstfilter, GST_STATE_PLAYING); if (ret == GST_STATE_CHANGE_ASYNC) return S_FALSE; return S_OK;

1 0

André Hentschel : wrc: Allow comma after popup name.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: a49eac930a3e6582b3df67f739206fc821f4e89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49eac930a3e6582b3df67f73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 13 17:28:34 2010 +0100 wrc: Allow comma after popup name. --- tools/wrc/parser.y | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 8c49114..e1a3c68 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -369,7 +369,7 @@ resource_file else $1 = rsc; - /* Final statements before were done */ + /* Final statements before we're done */ if ((head = get_resource_head($1)) != NULL) { if (resource_top) /* append to existing resources */ @@ -1278,13 +1278,14 @@ item_definitions * (who would want to specify a MF_x flag twice?). */ item_options - : /* Empty */ { $$ = 0; } - | opt_comma tCHECKED item_options { $$ = $3 | MF_CHECKED; } - | opt_comma tGRAYED item_options { $$ = $3 | MF_GRAYED; } - | opt_comma tHELP item_options { $$ = $3 | MF_HELP; } - | opt_comma tINACTIVE item_options { $$ = $3 | MF_DISABLED; } - | opt_comma tMENUBARBREAK item_options { $$ = $3 | MF_MENUBARBREAK; } - | opt_comma tMENUBREAK item_options { $$ = $3 | MF_MENUBREAK; } + : /* Empty */ { $$ = 0; } + | ',' item_options { $$ = $2; } + | tCHECKED item_options { $$ = $2 | MF_CHECKED; } + | tGRAYED item_options { $$ = $2 | MF_GRAYED; } + | tHELP item_options { $$ = $2 | MF_HELP; } + | tINACTIVE item_options { $$ = $2 | MF_DISABLED; } + | tMENUBARBREAK item_options { $$ = $2 | MF_MENUBARBREAK; } + | tMENUBREAK item_options { $$ = $2 | MF_MENUBREAK; } ; /* ------------------------------ MenuEx ------------------------------ */

1 0

Michael Stefaniuc : mmdevapi: Standardize the COM usage in devenum.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 1df7dab11515d66bbfb726f86299ddde0a8be20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df7dab11515d66bbfb726f86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:32 2010 +0100 mmdevapi: Standardize the COM usage in devenum.c. --- dlls/mmdevapi/devenum.c | 85 +++++++++++++++++++++++++++++----------------- 1 files changed, 53 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1df7dab11515d66bbfb72…

1 0

Michael Stefaniuc : msctf/tests: Standardize the COM usage in inputprocessor.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: d5c285ddb0892ffe4a4d825991052c4ebeff9b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c285ddb0892ffe4a4d82599… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:03:20 2010 +0100 msctf/tests: Standardize the COM usage in inputprocessor.c. --- dlls/msctf/tests/inputprocessor.c | 112 ++++++++++++++++++++++++------------- 1 files changed, 74 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5c285ddb0892ffe4a4d8…

1 0

Michael Stefaniuc : ole32/tests: Standardize the COM usage in clipboard.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 6012a506ccf27a6040176688d351a0905de95db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6012a506ccf27a6040176688d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:03:36 2010 +0100 ole32/tests: Standardize the COM usage in clipboard.c. --- dlls/ole32/tests/clipboard.c | 43 ++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1afa0e3..d97426c 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #include <stdarg.h> @@ -49,7 +50,7 @@ static inline char *dump_fmtetc(FORMATETC *fmt) } typedef struct DataObjectImpl { - const IDataObjectVtbl *lpVtbl; + IDataObject IDataObject_iface; LONG ref; FORMATETC *fmtetc; @@ -61,7 +62,7 @@ typedef struct DataObjectImpl { } DataObjectImpl; typedef struct EnumFormatImpl { - const IEnumFORMATETCVtbl *lpVtbl; + IEnumFORMATETC IEnumFORMATETC_iface; LONG ref; FORMATETC *fmtetc; @@ -79,9 +80,19 @@ static UINT cf_stream, cf_storage, cf_global, cf_another, cf_onemore; static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); +static inline DataObjectImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, DataObjectImpl, IDataObject_iface); +} + +static inline EnumFormatImpl *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return CONTAINING_RECORD(iface, EnumFormatImpl, IEnumFORMATETC_iface); +} + static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); @@ -94,14 +105,14 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedIncrement(&This->ref); return ref; } static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG ref = InterlockedDecrement(&This->ref); if(!ref) { @@ -115,7 +126,7 @@ static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count, i; trace("next: count %d cur %d\n", celt, This->cur); @@ -147,7 +158,7 @@ static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); This->cur = 0; return S_OK; @@ -174,7 +185,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO EnumFormatImpl *ret; ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFormatImpl)); - ret->lpVtbl = &VT_EnumFormatImpl; + ret->IEnumFORMATETC_iface.lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; ret->fmtetc_cnt = fmtetc_cnt; @@ -186,7 +197,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, LPVOID *ppvObj) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); @@ -199,14 +210,14 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedIncrement(&This->ref); return ref; } static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedDecrement(&This->ref); if(!ref) @@ -226,7 +237,7 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; BOOL foundFormat = FALSE; @@ -282,7 +293,7 @@ static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC * static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC *pformatetc) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; BOOL foundFormat = FALSE; @@ -320,7 +331,7 @@ static HRESULT WINAPI DataObjectImpl_SetData(IDataObject* iface, FORMATETC *pfor static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); DataObjectImpl_EnumFormatEtc_calls++; @@ -371,7 +382,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) DataObjectImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); - obj->lpVtbl = &VT_DataObjectImpl; + obj->IDataObject_iface.lpVtbl = &VT_DataObjectImpl; obj->ref = 1; obj->text = GlobalAlloc(GMEM_MOVEABLE, strlen(text) + 1); strcpy(GlobalLock(obj->text), text); @@ -398,7 +409,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) DEVMODEW dm; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); - obj->lpVtbl = &VT_DataObjectImpl; + obj->IDataObject_iface.lpVtbl = &VT_DataObjectImpl; obj->ref = 1; obj->text = GlobalAlloc(GMEM_MOVEABLE, strlen(cmpl_text_data) + 1); strcpy(GlobalLock(obj->text), cmpl_text_data);

1 0

Henri Verbeet : wined3d: Avoid some interface pointers in set_glsl_shader_program().
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 77beea98b9e889e4bf8bb96a511ebe708ec180ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=77beea98b9e889e4bf8bb96a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 17:58:43 2010 +0100 wined3d: Avoid some interface pointers in set_glsl_shader_program(). --- dlls/wined3d/glsl_shader.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a2fb79a..72251eb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4289,8 +4289,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, IWineD3DDeviceImpl *device, BOOL use_ps, BOOL use_vs) { const struct wined3d_state *state = &device->stateBlock->state; - IWineD3DVertexShader *vshader = use_vs ? (IWineD3DVertexShader *)state->vertex_shader : NULL; - IWineD3DPixelShader *pshader = use_ps ? (IWineD3DPixelShader *)state->pixel_shader : NULL; + IWineD3DVertexShaderImpl *vshader = use_vs ? state->vertex_shader : NULL; + IWineD3DPixelShaderImpl *pshader = use_ps ? state->pixel_shader : NULL; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = device->shader_priv; struct glsl_shader_prog_link *entry = NULL; @@ -4301,11 +4301,13 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; - if (vshader) find_vs_compile_args(state, (IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); - if (pshader) find_ps_compile_args(state, (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); + if (vshader) find_vs_compile_args(state, vshader, &vs_compile_args); + if (pshader) find_ps_compile_args(state, pshader, &ps_compile_args); - entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); - if (entry) { + entry = get_glsl_program_entry(priv, (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, + &vs_compile_args, &ps_compile_args); + if (entry) + { priv->glsl_program = entry; return; } @@ -4317,8 +4319,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Create the entry */ entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; - entry->vshader = vshader; - entry->pshader = pshader; + entry->vshader = (IWineD3DVertexShader *)vshader; + entry->pshader = (IWineD3DPixelShader *)pshader; entry->vs_args = vs_compile_args; entry->ps_args = ps_compile_args; entry->constant_version = 0; @@ -4332,12 +4334,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Attach GLSL vshader */ if (vshader) { - GLhandleARB vshader_id = find_glsl_vshader(context, &priv->shader_buffer, - (IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); - WORD map = ((IWineD3DBaseShaderImpl *)vshader)->baseShader.reg_maps.input_registers; + GLhandleARB vshader_id = find_glsl_vshader(context, &priv->shader_buffer, vshader, &vs_compile_args); + WORD map = vshader->baseShader.reg_maps.input_registers; char tmp_name[10]; - reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, vshader, pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, + (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, gl_info); TRACE("Attaching GLSL shader object %u to program %u\n", reorder_shader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, reorder_shader_id)); checkGLcall("glAttachObjectARB"); @@ -4368,19 +4370,19 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } checkGLcall("glBindAttribLocationARB"); - list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry); + list_add_head(&vshader->baseShader.linked_programs, &entry->vshader_entry); } /* Attach GLSL pshader */ if (pshader) { GLhandleARB pshader_id = find_glsl_pshader(context, &priv->shader_buffer, - (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args, &entry->np2Fixup_info); + pshader, &ps_compile_args, &entry->np2Fixup_info); TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, pshader_id)); checkGLcall("glAttachObjectARB"); - list_add_head(&((IWineD3DBaseShaderImpl *)pshader)->baseShader.linked_programs, &entry->pshader_entry); + list_add_head(&pshader->baseShader.linked_programs, &entry->pshader_entry); } /* Link the program */ @@ -4439,8 +4441,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, checkGLcall("Find glsl program uniform locations"); if (pshader - && ((IWineD3DPixelShaderImpl *)pshader)->baseShader.reg_maps.shader_version.major >= 3 - && ((IWineD3DPixelShaderImpl *)pshader)->declared_in_count > vec4_varyings(3, gl_info)) + && pshader->baseShader.reg_maps.shader_version.major >= 3 + && pshader->declared_in_count > vec4_varyings(3, gl_info)) { TRACE("Shader %d needs vertex color clamping disabled\n", programId); entry->vertex_color_clamp = GL_FALSE; @@ -4467,11 +4469,11 @@ static void set_glsl_shader_program(const struct wined3d_context *context, * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles * later */ - if (pshader && !((IWineD3DBaseShaderImpl *)pshader)->baseShader.load_local_constsF) + if (pshader && !pshader->baseShader.load_local_constsF) { hardcode_local_constants((IWineD3DBaseShaderImpl *) pshader, gl_info, programId, 'P'); } - if (vshader && !((IWineD3DBaseShaderImpl *)vshader)->baseShader.load_local_constsF) + if (vshader && !vshader->baseShader.load_local_constsF) { hardcode_local_constants((IWineD3DBaseShaderImpl *) vshader, gl_info, programId, 'V'); }

1 0