January 2013 - Wine-Commits

Damjan Jovanovic : quartz: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 4bb45afc3fc8387b9726c6315888a6902fcafa06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb45afc3fc8387b9726c6315… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 17 07:40:39 2013 +0200 quartz: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash. --- dlls/quartz/parser.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index da9b4b1..f0b1b93 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -595,7 +595,14 @@ static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMe *pAlloc = NULL; if (This->alloc) + { hr = IMemInputPin_NotifyAllocator(pPin, This->alloc, This->readonly); + if (SUCCEEDED(hr)) + { + *pAlloc = This->alloc; + IMemAllocator_AddRef(*pAlloc); + } + } else hr = VFW_E_NO_ALLOCATOR; @@ -661,6 +668,8 @@ static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) FreeMediaType(This->pmt); CoTaskMemFree(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); + if (This->pin.pAllocator) + IMemAllocator_Release(This->pin.pAllocator); CoTaskMemFree(This); return 0; }

1 0

Henri Verbeet : wined3d: Get rid of the surface_type parameter to wined3d_surface_create().
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: ce912d5149d6e0b0cb7903400f82e6b54fcffbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce912d5149d6e0b0cb7903400… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:27 2013 +0100 wined3d: Get rid of the surface_type parameter to wined3d_surface_create(). --- dlls/d3d10core/device.c | 3 +- dlls/d3d8/surface.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/ddraw/ddraw.c | 6 ++-- dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 45 +++++++++++---------------------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 5 +-- 10 files changed, 24 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce912d5149d6e0b0cb790…

1 0

Henri Verbeet : ddraw: Avoid LPD3DSTATUS.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 8e7590e22fdd941a5fd895096acab49bbc37ed06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7590e22fdd941a5fd895096… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:25 2013 +0100 ddraw: Avoid LPD3DSTATUS. --- dlls/ddraw/executebuffer.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b86495f..2925cfa 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -512,13 +512,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD i; TRACE("SETSTATUS (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DSTATUS ci = (LPD3DSTATUS) instr; - - buffer->data.dsStatus = *ci; - - instr += size; - } + for (i = 0; i < count; ++i) + { + buffer->data.dsStatus = *(D3DSTATUS *)instr; + instr += size; + } } break; default:

1 0

Andrew Talbot : explorerframe: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 33c3a75655e8a07cf150d9d2418e68bd63f06634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c3a75655e8a07cf150d9d24… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 16 20:41:36 2013 +0000 explorerframe: Avoid signed-unsigned integer comparisons. --- dlls/explorerframe/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 00ad1f6..d5e78e7 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -973,7 +973,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, nstc_root *new_root; struct list *add_after_entry; HTREEITEM add_after_hitem; - UINT i; + int i; TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif);

1 0

Damjan Jovanovic : winegstreamer: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 4bdfa7f864553c478890fd9607c742f20f24034b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdfa7f864553c478890fd960… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 17 07:38:12 2013 +0200 winegstreamer: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash. --- dlls/winegstreamer/gstdemux.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41158ff..52935d0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1478,6 +1478,8 @@ static ULONG WINAPI GSTOutPin_Release(IPin *iface) { DeleteMediaType(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); gst_segment_free(This->segment); + if (This->pin.pAllocator) + IMemAllocator_Release(This->pin.pAllocator); CoTaskMemFree(This); return 0; } @@ -1510,7 +1512,14 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputP *pAlloc = NULL; if (GSTfilter->pInputPin.pAlloc) + { hr = IMemInputPin_NotifyAllocator(pPin, GSTfilter->pInputPin.pAlloc, FALSE); + if (SUCCEEDED(hr)) + { + *pAlloc = GSTfilter->pInputPin.pAlloc; + IMemAllocator_AddRef(*pAlloc); + } + } else hr = VFW_E_NO_ALLOCATOR;

1 0

Damjan Jovanovic : Return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 8337959c78c815593904f0ff920354e50be19dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8337959c78c815593904f0ff9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 17 07:39:17 2013 +0200 Return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash. --- dlls/wineqtdecoder/qtsplitter.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a3cd91f..03cc8a9 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1352,6 +1352,8 @@ static ULONG WINAPI QTOutPin_Release(IPin *iface) { DeleteMediaType(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); + if (This->pin.pAllocator) + IMemAllocator_Release(This->pin.pAllocator); CoTaskMemFree(This); return 0; } @@ -1384,7 +1386,14 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi *pAlloc = NULL; if (QTfilter->pInputPin.pAlloc) + { hr = IMemInputPin_NotifyAllocator(pPin, QTfilter->pInputPin.pAlloc, FALSE); + if (SUCCEEDED(hr)) + { + *pAlloc = QTfilter->pInputPin.pAlloc; + IMemAllocator_AddRef(*pAlloc); + } + } else hr = VFW_E_NO_ALLOCATOR;

1 0

Andrew Talbot : fusion: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: c46636b1cf48e9c2e2284109aa88d013f83b8579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46636b1cf48e9c2e2284109a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 16 20:42:26 2013 +0000 fusion: Avoid signed-unsigned integer comparisons. --- dlls/fusion/asmname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 78bc978..162a76b 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -261,7 +261,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, { static const WCHAR spec[] = {'%','d',0}; static const WCHAR period[] = {'.',0}; - int i; + DWORD i; wsprintfW(verstr, spec, name->version[0]);

1 0

Henri Verbeet : ddraw: Avoid LPD3DCLIPSTATUS.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: aa4b4e8ab2d353adde4829da6205731941f306d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4b4e8ab2d353adde4829da6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:26 2013 +0100 ddraw: Avoid LPD3DCLIPSTATUS. --- include/d3d.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 2ee638e..b3d765d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1056,8 +1056,8 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; - STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; - STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; + STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; + STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; }; #undef INTERFACE @@ -1175,8 +1175,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; - STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; - STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; + STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; + STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, @@ -1320,8 +1320,8 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(PreLoad)(THIS_ IDirectDrawSurface7 *surface) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; - STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; - STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; + STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; + STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb,

1 0

Henri Verbeet : wined3d: Get rid of the surface_type parameter to wined3d_check_device_format().
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 1249976eb69343b086ac4d0c1f332ee8b4051c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1249976eb69343b086ac4d0c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:28 2013 +0100 wined3d: Get rid of the surface_type parameter to wined3d_check_device_format(). --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 34 +++++++++++++++------------------- dlls/ddraw/ddraw_private.h | 14 +++++++------- dlls/ddraw/device.c | 17 +++++++---------- dlls/ddraw/main.c | 10 +++++----- dlls/wined3d/directx.c | 22 ++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 9 +-------- 9 files changed, 48 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1249976eb69343b086ac4…

1 0

Henri Verbeet : wined3d: Get rid of the "opengl" field in struct wined3d_adapter.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 6c7cce55a771459ab361d29eb09439997f0f506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7cce55a771459ab361d29eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:29 2013 +0100 wined3d: Get rid of the "opengl" field in struct wined3d_adapter. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 491c224..40ffe66 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1188,7 +1188,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (!device->adapter->opengl) + if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; device->valid_rt_mask = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e5b7f33..b8fba57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5137,8 +5137,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_VISIBLE; caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; - /* Set D3D caps if OpenGL is available. */ - if (adapter->opengl) + if (!(wined3d->flags & WINED3D_NO3D)) { caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_MIPMAP | @@ -5601,7 +5600,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); fillGLAttribFuncs(&adapter->gl_info); - adapter->opengl = TRUE; } wined3d->adapter_count = 1; TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ed777e5..af5ad2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1569,8 +1569,6 @@ struct wined3d_driver_info struct wined3d_adapter { UINT ordinal; - BOOL opengl; - POINT monitorPoint; enum wined3d_format_id screen_format;

1 0