January 2015 - Wine-commits

Michael Stefaniuc : usp10: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 7d1203a741a9b16d0f0618d5a8cb48008f17c79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1203a741a9b16d0f0618d5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:07:09 2015 +0100 usp10: Remove an unused assignment (PVS-Studio). --- dlls/usp10/usp10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5efbb82..628f45c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1952,9 +1952,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex && !analysis->pItem[i].a.fRTL) analysis->pItem[i].a.fNoGlyphIndex = TRUE; - hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], - cChar, numGlyphs, &analysis->pItem[i].a, - glyphs, pwLogClust, psva, &numGlyphsReturned); + ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, + &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, piAdvance, pGoffset, abc); if (originalFont)

1 0

Matteo Bruni : wined3d: Add separate stencil state setup via GL 2.0+ core functions.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 8ddb7e32f87e2c8f9e10b4dff19d7a896523690f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddb7e32f87e2c8f9e10b4dff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 21 18:32:32 2015 +0100 wined3d: Add separate stencil state setup via GL 2.0+ core functions. --- dlls/wined3d/directx.c | 5 ++++- dlls/wined3d/state.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f50b5e..4b003d2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2889,6 +2889,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ + USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -4915,7 +4917,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR; } - if (gl_info->supported[EXT_STENCIL_TWO_SIDE] || gl_info->supported[ATI_SEPARATE_STENCIL]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0] || gl_info->supported[EXT_STENCIL_TWO_SIDE] + || gl_info->supported[ATI_SEPARATE_STENCIL]) { caps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7cf14d..7f65998 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -860,7 +860,15 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glEnable(GL_STENCIL_TEST); checkGLcall("glEnable GL_STENCIL_TEST"); - if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0]) + { + GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); + GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); + GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func_ccw, ref, mask)); + GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); + checkGLcall("setting two sided stencil state"); + } + else if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) { /* Apply back first, then front. This function calls glActiveStencilFaceEXT, * which has an effect on the code below too. If we apply the front face @@ -881,7 +889,9 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ checkGLcall("glStencilOpSeparateATI(GL_FRONT, ...)"); GL_EXTCALL(glStencilOpSeparateATI(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); checkGLcall("glStencilOpSeparateATI(GL_BACK, ...)"); - } else { + } + else + { ERR("Separate (two sided) stencil not supported on this version of opengl. Caps weren't honored?\n"); } }

1 0

Matteo Bruni : wined3d: Don't normalize R8G8B8A8_UINT attributes.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 270431c220e31db3f0fb5bddcd5e74227515d70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=270431c220e31db3f0fb5bddc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 21 18:32:33 2015 +0100 wined3d: Don't normalize R8G8B8A8_UINT attributes. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7f65998..3c204ca 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4279,7 +4279,7 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R8G8B8A8_UINT: - GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); + GL_EXTCALL(glVertexAttrib4ubvARB(i, ptr)); break; case WINED3DFMT_B8G8R8A8_UNORM: if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA])

1 0

Nikolay Sivov : dwrite: Initial implementation of GetGlyphPlacements().
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 711b9f0414a7673f7fc702e60d1ef49f7fe50315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711b9f0414a7673f7fc702e60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 22 14:43:24 2015 +0300 dwrite: Initial implementation of GetGlyphPlacements(). --- dlls/dwrite/analyzer.c | 48 ++++++++++++--- dlls/dwrite/tests/analyzer.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/layout.c | 4 +- 3 files changed, 185 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=711b9f0414a7673f7fc70…

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.7.
by Alexandre Julliard 22 Jan '15

22 Jan '15

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: bugzilla Branch: master Commit: 2e3e0b31a34a21d572d5c16267162d8bc354d52b URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=2e3e0b31a34a21d572d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 22 09:08:12 2015 +0100 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.7.
by Alexandre Julliard 22 Jan '15

22 Jan '15

1 0

Michael Stefaniuc : oleaut32: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 54aaa16d8ffe0ca37b37be291a3c496f2885fa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54aaa16d8ffe0ca37b37be291… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 11:59:34 2015 +0100 oleaut32: Remove an unused assignment (PVS-Studio). --- dlls/oleaut32/tmarshal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index b812215..89dc894 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -198,8 +198,6 @@ _marshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN pUnk) { return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); } - hres = E_FAIL; - TRACE("...%s...\n",debugstr_guid(riid)); hres = CreateStreamOnHGlobal(0,TRUE,&pStm);

1 0

Michael Stefaniuc : qedit: Remove an unused and wrong assignment ( PVS-Studio).
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 552037c92599d0212875410b33811effe0a4255d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552037c92599d0212875410b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:01:05 2015 +0100 qedit: Remove an unused and wrong assignment (PVS-Studio). --- dlls/qedit/mediadet.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3d79107..9098223 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -658,7 +658,6 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->cur_pin = NULL; obj->num_streams = -1; obj->cur_stream = 0; - *ppv = obj; if (pUnkOuter) obj->outer_unk = pUnkOuter;

1 0

Michael Stefaniuc : quartz: Remove some unused assignments (PVS-Studio).
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 33136293baca8f82535ed13386b2a9112ffc4727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33136293baca8f82535ed1338… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:01:34 2015 +0100 quartz: Remove some unused assignments (PVS-Studio). --- dlls/quartz/avisplit.c | 5 ++--- dlls/quartz/mpegsplit.c | 3 +-- dlls/quartz/pin.c | 1 - dlls/quartz/waveparser.c | 6 +++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ee03e08..ccb4cec 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -260,8 +260,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (rtSampleStart != rtSampleStop) { - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) @@ -338,7 +337,7 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, } rtstart = (double)(start - pin->pin.pin.tStart) / pin->pin.pin.dRate; rtstop = (double)(stop - pin->pin.pin.tStart) / pin->pin.pin.dRate; - hr = IMediaSample_SetMediaTime(sample, &start, &stop); + IMediaSample_SetMediaTime(sample, &start, &stop); IMediaSample_SetTime(sample, &rtstart, &rtstop); IMediaSample_SetMediaTime(sample, &start, &stop); diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 6f09822..1ed352b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -708,8 +708,7 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 73b6306..78b6fa2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -75,7 +75,6 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi hr = IPin_QueryInternalConnections( from, NULL, &amount ); if (hr != E_NOTIMPL && amount) FIXME("Use QueryInternalConnections!\n"); - hr = S_OK; pin_info.pFilter = NULL; hr = IPin_QueryPinInfo( from, &pin_info ); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 113a461..2ceb0fd 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -117,7 +117,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; @@ -290,7 +290,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, amt.cbFormat = chunk.cb; amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pUnk = NULL; - hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); + IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); amt.subtype = MEDIATYPE_Audio; amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; @@ -376,7 +376,7 @@ static HRESULT WAVEParser_first_request(LPVOID iface) if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop;

1 0