June 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use texture2d_load_texture() in texture1d_load_location().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: c4ba02aac431f7396e7c7a5bfd1716d175608523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ba02aac431f7396e7c7a5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 04:38:09 2019 +0430 wined3d: Use texture2d_load_texture() in texture1d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 154 +------------------------------ dlls/wined3d/texture.c | 200 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 11 ++- 3 files changed, 172 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4ba02aac431f7396e7c…

1 0

Zebediah Figura : strmbase: Share pin and filter reference counts in base pin reference counting methods.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 42b3fd84bbbc691628fed94cd012db7ab8c76127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b3fd84bbbc691628fed94c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:34 2019 -0500 strmbase: Share pin and filter reference counts in base pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 1 - dlls/strmbase/pin.c | 41 ++++++++--------------------------------- dlls/winegstreamer/gstdemux.c | 1 - dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 6 ++---- 5 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5c1fcdc..e99a493 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -174,7 +174,6 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO *info, { /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = PullPin_Vtbl; - pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; /* avoid copying uninitialized data */ diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f578751..ebc7a1c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -173,14 +173,16 @@ LONG WINAPI BasePinImpl_GetMediaTypeVersion(BasePin *iface) return 1; } -ULONG WINAPI BasePinImpl_AddRef(IPin * iface) +ULONG WINAPI BasePinImpl_AddRef(IPin *iface) { - BasePin *This = impl_from_IPin(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); - - TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); + BasePin *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pinInfo.pFilter); +} - return refCount; +ULONG WINAPI BasePinImpl_Release(IPin *iface) +{ + BasePin *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pinInfo.pFilter); } HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface) @@ -379,19 +381,6 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI return E_NOINTERFACE; } -ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) -{ - BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); - - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - - if (!refCount) - BaseOutputPin_Destroy(This); - - return refCount; -} - HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { HRESULT hr; @@ -733,7 +722,6 @@ static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, { memset(pin, 0, sizeof(*pin)); pin->IPin_iface.lpVtbl = vtbl; - pin->refCount = 1; pin->pCritSec = cs; pin->dRate = 1.0; Copy_PinInfo(&pin->pinInfo, info); @@ -825,19 +813,6 @@ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID return E_NOINTERFACE; } -ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) -{ - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); - - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - - if (!refCount) - BaseInputPin_Destroy(This); - - return refCount; -} - HRESULT WINAPI BaseInputPinImpl_Connect(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { ERR("(%p)->(%p, %p) outgoing connection on an input pin!\n", iface, pin, pmt); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bc2cb2b..8dc2355 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1286,7 +1286,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; - This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; ZeroMemory(&This->pInputPin.pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8298406..8b271d2 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -318,7 +318,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; - This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1a8b8aa..c19bc6c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -31,7 +31,6 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType); typedef struct BasePin { IPin IPin_iface; - LONG refCount; LPCRITICAL_SECTION pCritSec; PIN_INFO pinInfo; IPin * pConnectedTo; @@ -103,7 +102,8 @@ typedef struct BaseInputPinFuncTable { /* Base Pin */ HRESULT WINAPI BasePinImpl_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *pmt); LONG WINAPI BasePinImpl_GetMediaTypeVersion(BasePin *This); -ULONG WINAPI BasePinImpl_AddRef(IPin * iface); +ULONG WINAPI BasePinImpl_AddRef(IPin *iface); +ULONG WINAPI BasePinImpl_Release(IPin *iface); HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface); HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin); HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt); @@ -117,7 +117,6 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER /* Base Output Pin */ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface); @@ -141,7 +140,6 @@ void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_IN /* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI BaseInputPinImpl_Release(IPin * iface); HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseInputPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt);

1 0

Alexandre Julliard : qwave: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 5658defa0623d0a0d79f89687b63fb66edd0973b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5658defa0623d0a0d79f8968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:48 2019 +0200 qwave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/Makefile.in | 2 ++ dlls/qwave/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index 5b4015c..2a2336a 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,5 +1,7 @@ MODULE = qwave.dll IMPORTLIB = qwave +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index 6d77b29..685fcfb 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Zebediah Figura : quartz: Use strmbase pin reference counting methods.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: d021b5d2626a31a2ab75fbd112a48b2a7a47ae66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d021b5d2626a31a2ab75fbd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:36 2019 -0500 quartz: Use strmbase pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 16 ++-------------- dlls/quartz/parser.c | 20 ++++---------------- dlls/quartz/pin.c | 12 ------------ dlls/quartz/pin.h | 2 -- 4 files changed, 6 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 25bffe6..afac6f7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -777,23 +777,11 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii return E_NOINTERFACE; } -static ULONG WINAPI FileAsyncReaderPin_AddRef(IPin *iface) -{ - FileAsyncReader *pin = impl_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) -{ - FileAsyncReader *pin = impl_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static const IPinVtbl FileAsyncReaderPin_Vtbl = { FileAsyncReaderPin_QueryInterface, - FileAsyncReaderPin_AddRef, - FileAsyncReaderPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BasePinImpl_Disconnect, diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 5743a53..652d410 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -564,18 +564,6 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI Parser_OutputPin_AddRef(IPin *iface) -{ - Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) -{ - Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); @@ -601,8 +589,8 @@ static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MED static const IPinVtbl Parser_OutputPin_Vtbl = { Parser_OutputPin_QueryInterface, - Parser_OutputPin_AddRef, - Parser_OutputPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, Parser_OutputPin_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, @@ -714,8 +702,8 @@ static HRESULT WINAPI Parser_PullPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes static const IPinVtbl Parser_InputPin_Vtbl = { Parser_PullPin_QueryInterface, - PullPin_AddRef, - PullPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, Parser_PullPin_ReceiveConnection, Parser_PullPin_Disconnect, diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index e99a493..03ca4e6 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -381,18 +381,6 @@ void PullPin_destroy(PullPin *pin) CoTaskMemFree(pin); } -ULONG WINAPI PullPin_AddRef(IPin *iface) -{ - PullPin *pin = impl_PullPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -ULONG WINAPI PullPin_Release(IPin *iface) -{ - PullPin *pin = impl_PullPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static void PullPin_Flush(PullPin *This) { IMediaSample *pSample; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index b65d223..efed724 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -115,8 +115,6 @@ void PullPin_destroy(PullPin *pin) DECLSPEC_HIDDEN; HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI PullPin_Disconnect(IPin * iface); HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI PullPin_AddRef(IPin *iface) DECLSPEC_HIDDEN; -ULONG WINAPI PullPin_Release(IPin *iface) DECLSPEC_HIDDEN; HRESULT WINAPI PullPin_EndOfStream(IPin * iface); HRESULT WINAPI PullPin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI PullPin_BeginFlush(IPin * iface);

1 0

Zebediah Figura : strmbase: Use base pin reference counting methods.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: e483b4a336d7c7fb58ea85e010f0dc623247bad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e483b4a336d7c7fb58ea85e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:35 2019 -0500 strmbase: Use base pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 16 ++-------------- dlls/strmbase/transform.c | 32 ++++---------------------------- 2 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 36e934f..b216166 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -45,18 +45,6 @@ static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { QualityControlImpl_SetSink }; -static ULONG WINAPI BaseRenderer_InputPin_AddRef(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI BaseRenderer_InputPin_Release(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -176,8 +164,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) static const IPinVtbl BaseRenderer_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - BaseRenderer_InputPin_AddRef, - BaseRenderer_InputPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, BaseRenderer_InputPin_ReceiveConnection, BaseRenderer_InputPin_Disconnect, diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 4c32d67..c4a0789 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -381,18 +381,6 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); } -static ULONG WINAPI TransformFilter_InputPin_AddRef(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI TransformFilter_InputPin_Release(IPin *iface) -{ - BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); @@ -516,8 +504,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC static const IPinVtbl TransformFilter_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - TransformFilter_InputPin_AddRef, - TransformFilter_InputPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, TransformFilter_InputPin_ReceiveConnection, TransformFilter_InputPin_Disconnect, @@ -555,23 +543,11 @@ static HRESULT WINAPI transform_source_QueryInterface(IPin *iface, REFIID iid, v return S_OK; } -static ULONG WINAPI transform_source_AddRef(IPin *iface) -{ - BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI transform_source_Release(IPin *iface) -{ - BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static const IPinVtbl TransformFilter_OutputPin_Vtbl = { transform_source_QueryInterface, - transform_source_AddRef, - transform_source_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_unload_vertex_data().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 26203c8a58e268b5c84c528d48fed568846833c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26203c8a58e268b5c84c528d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 04:38:06 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_unload_vertex_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a024e28..b1dfa0d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5093,12 +5093,11 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context } /* This should match any arrays loaded in context_load_vertex_data(). */ -static void context_unload_vertex_data(struct wined3d_context *context) +static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - if (!context->namedArraysLoaded) + if (!context_gl->c.namedArraysLoaded) return; gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); @@ -5106,7 +5105,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); wined3d_context_gl_unload_tex_coords(context_gl); - context->namedArraysLoaded = FALSE; + context_gl->c.namedArraysLoaded = FALSE; } static void context_load_vertex_data(struct wined3d_context *context, @@ -5547,7 +5546,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context if (context_gl->c.use_immediate_mode_draw) return; - context_unload_vertex_data(&context_gl->c); + wined3d_context_gl_unload_vertex_data(context_gl); if (context_gl->c.d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); @@ -5635,7 +5634,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); - context_unload_vertex_data(context); + wined3d_context_gl_unload_vertex_data(context_gl); context_unload_numbered_arrays(context); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW));

1 0

Alexandre Julliard : rpcrt4: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: eadb037ba115e1101645d8260bb5cb9e8e52a87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadb037ba115e1101645d826… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:06 2019 +0200 rpcrt4: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 ++ dlls/rpcrt4/cproxy.c | 3 --- dlls/rpcrt4/cpsf.c | 26 +++++++++++--------------- dlls/rpcrt4/cstub.c | 3 --- dlls/rpcrt4/ndr_marshall.c | 5 ++--- dlls/rpcrt4/ndr_stubless.c | 3 --- dlls/rpcrt4/rpc_assoc.c | 5 ++--- dlls/rpcrt4/rpc_binding.c | 21 ++++++++++----------- dlls/rpcrt4/rpc_server.c | 3 --- dlls/rpcrt4/rpc_transport.c | 29 ++++++++++++++--------------- dlls/rpcrt4/rpcrt4_main.c | 5 +---- 11 files changed, 42 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eadb037ba115e1101645…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to draw_indirect().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 6001575f9d3e4594cdd5e957062b12781c06f4ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=6001575f9d3e4594cdd5e957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 04:38:05 2019 +0430 wined3d: Pass a wined3d_context_gl structure to draw_indirect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a7aafc..a024e28 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4709,10 +4709,10 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, checkGLcall("draw immediate mode"); } -static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, +static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_buffer *buffer = parameters->buffer; const void *offset; @@ -4977,7 +4977,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) - draw_indirect(context, state, &parameters->u.indirect, idx_size); + wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); else FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); }

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.0.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: faa7564d375a6d4672da0bfe35f367199188e114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faa7564d375a6d4672da0bfe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 18 12:57:20 2019 -0500 mscoree: Update Wine Mono to 4.9.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index ed9ae3a..08d9f85 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.3" -#define MONO_SHA "d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76" +#define MONO_VERSION "4.9.0" +#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8311db7..7420b4b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.8.3" +#define WINE_MONO_VERSION "4.9.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Alexandre Julliard : kernelbase: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 483de1a8a263f83fa991fd6daa47feda8681d3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=483de1a8a263f83fa991fd6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 22:38:09 2019 +0200 kernelbase: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/main.c | 10 ++ dlls/kernelbase/path.c | 350 ++++++++++++++++++++------------------------ dlls/kernelbase/string.c | 93 ++++++------ tools/winegcc/winegcc.c | 2 + 5 files changed, 222 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=483de1a8a263f83fa991…

1 0