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

Dmitry Timoshkov : mshtml: Add recently added GUIDs to debugstr_mshtml_guid().
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 63946a2942595016c83659ee3d8840e19a58fb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63946a2942595016c83659ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 14:09:43 2019 +0800 mshtml: Add recently added GUIDs to debugstr_mshtml_guid(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 7cb3006..29396a5 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -705,6 +705,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IDispatch); X(IID_IDispatchEx); X(IID_IDispatchJS); + X(IID_IDisplayServices); X(IID_UndocumentedScriptIface); X(IID_IEnumConnections); X(IID_IEnumVARIANT); @@ -719,6 +720,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IInternetProtocol); X(IID_IInternetProtocolRoot); X(IID_IManagedObject); + X(IID_IMarkupContainer); + X(IID_IMarkupServices); X(IID_IMarshal); X(IID_IMonikerProp); X(IID_IObjectIdentity);

1 0

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

June 18, 2019

Module: wine Branch: master Commit: 4b08c00e0f5ca25704133acb364169be5bbdc4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b08c00e0f5ca25704133acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:12 2019 +0200 printui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/Makefile.in | 2 ++ dlls/printui/printui.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index 112d418..8e76c7c 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,6 +1,8 @@ MODULE = printui.dll IMPORTS = shell32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ printui.c diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 32e7b52..f35107f 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -31,7 +31,6 @@ #include "winnls.h" #include "shellapi.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "printui_private.h" @@ -151,7 +150,7 @@ static BOOL parse_rundll(context_t * cx) while ( c ) { txtW[0] = c; - ptr = strchrW(optionsW, c); + ptr = wcschr(optionsW, c); if (ptr) { index = ptr - optionsW; cx->options[index] = get_next_wstr(cx); @@ -160,7 +159,7 @@ static BOOL parse_rundll(context_t * cx) } else { - ptr = strchrW(flagsW, c); + ptr = wcschr(flagsW, c); if (ptr) { index = ptr - flagsW; cx->flags[index] = TRUE;

1 0

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

June 18, 2019

Module: wine Branch: master Commit: aa16c7da445526d4e9d2929b479e257e1c7fb5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16c7da445526d4e9d2929b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:44 2019 +0200 photometadatahandler: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/photometadatahandler/Makefile.in | 2 ++ dlls/photometadatahandler/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/photometadatahandler/Makefile.in b/dlls/photometadatahandler/Makefile.in index 8b52cb0..c791b4c 100644 --- a/dlls/photometadatahandler/Makefile.in +++ b/dlls/photometadatahandler/Makefile.in @@ -1,5 +1,7 @@ MODULE = photometadatahandler.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/photometadatahandler/main.c b/dlls/photometadatahandler/main.c index 9ad44ff..7a9878d 100644 --- a/dlls/photometadatahandler/main.c +++ b/dlls/photometadatahandler/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

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

June 18, 2019

Module: wine Branch: master Commit: 59f23b3139ce01ba142195451b026883f5d068a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f23b3139ce01ba14219545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:21 2019 +0200 packager: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/Makefile.in | 2 ++ dlls/packager/packager_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in index a2b2daa..a90014c 100644 --- a/dlls/packager/Makefile.in +++ b/dlls/packager/Makefile.in @@ -1,6 +1,8 @@ MODULE = packager.dll IMPORTS = uuid shell32 shlwapi user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ packager_main.c diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index d70202b..0a0790e 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS

1 0

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

June 18, 2019

Module: wine Branch: master Commit: 15a7f2af678113015df0c1b7cc50115215473cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a7f2af678113015df0c1b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:32 2019 +0200 olesvr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr.dll16/Makefile.in | 2 +- dlls/olesvr.dll16/olesvr.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index d894b58..02ed8ae 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = olesvr.dll16 IMPORTS = gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olesvr32.dll C_SRCS = olesvr.c diff --git a/dlls/olesvr.dll16/olesvr.c b/dlls/olesvr.dll16/olesvr.c index 0dcc705..44e6822 100644 --- a/dlls/olesvr.dll16/olesvr.c +++ b/dlls/olesvr.dll16/olesvr.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Zebediah Figura : wineqtdecoder: Share sink pin and filter reference counts.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: f194d99d20a9d8c8e228a4230962d405feda0aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f194d99d20a9d8c8e228a423… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:59 2019 -0500 wineqtdecoder: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 45 ++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 3dd530f..8a88729 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -225,7 +225,6 @@ static void qt_splitter_destroy(BaseFilter *iface) { QTSplitter *filter = impl_from_BaseFilter(iface); IPin *peer = NULL; - ULONG pinref; EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ @@ -235,15 +234,15 @@ static void qt_splitter_destroy(BaseFilter *iface) IPin_Disconnect(peer); IPin_Release(peer); } - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - if (pinref) - { - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - } + FreeMediaType(&filter->pInputPin.pin.mtCurrent); + if (filter->pInputPin.pAlloc) + IMemAllocator_Release(filter->pInputPin.pAlloc); + filter->pInputPin.pAlloc = NULL; + if (filter->pInputPin.pReader) + IAsyncReader_Release(filter->pInputPin.pReader); + filter->pInputPin.pReader = NULL; + filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -833,26 +832,16 @@ static inline QTInPin *impl_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); } -static ULONG WINAPI QTInPin_Release(IPin *iface) +static ULONG WINAPI QTInPin_AddRef(IPin *iface) { - QTInPin *This = impl_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); + QTInPin *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - if (!refCount) - { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAlloc) - IMemAllocator_Release(This->pAlloc); - This->pAlloc = NULL; - if (This->pReader) - IAsyncReader_Release(This->pReader); - This->pReader = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - return 0; - } - else - return refCount; +static ULONG WINAPI QTInPin_Release(IPin *iface) +{ + QTInPin *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) @@ -1288,7 +1277,7 @@ static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEn static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_QueryInterface, - BasePinImpl_AddRef, + QTInPin_AddRef, QTInPin_Release, BaseInputPinImpl_Connect, QTInPin_ReceiveConnection,

1 0

Zebediah Figura : winegstreamer: Share source pin and filter reference counts.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 8983528f6050c39305107f79b5aaf14d728bf8ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8983528f6050c39305107f79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:58 2019 -0500 winegstreamer: Share source pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 99 +++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 55 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3640fd9..bc2cb2b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1688,41 +1688,16 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** return E_NOINTERFACE; } -static ULONG WINAPI GSTOutPin_Release(IPin *iface) +static ULONG WINAPI GSTOutPin_AddRef(IPin *iface) { - GSTOutPin *This = impl_source_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - mark_wine_thread(); + GSTOutPin *pin = impl_source_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) { - if (This->their_src) { - if (This->flipfilter) { - gst_pad_unlink(This->their_src, This->flip_sink); - gst_pad_unlink(This->flip_src, This->my_sink); - gst_object_unref(This->flip_src); - gst_object_unref(This->flip_sink); - This->flipfilter = NULL; - This->flip_src = This->flip_sink = NULL; - } else - gst_pad_unlink(This->their_src, This->my_sink); - gst_object_unref(This->their_src); - } - gst_object_unref(This->my_sink); - CloseHandle(This->caps_event); - DeleteMediaType(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - gst_segment_free(This->segment); - if(This->gstpool) - gst_object_unref(This->gstpool); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI GSTOutPin_Release(IPin *iface) +{ + GSTOutPin *pin = impl_source_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI GSTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) @@ -1780,30 +1755,47 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *base, IMemInputPi return hr; } -static HRESULT break_source_connection(BaseOutputPin *This) +static void free_source_pin(GSTOutPin *pin) { - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + EnterCriticalSection(pin->pin.pin.pCritSec); + if (pin->pin.pin.pConnectedTo) { - hr = IMemAllocator_Decommit(This->pAllocator); - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect((IPin *)This); + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(&pin->pin.pin.IPin_iface); } - LeaveCriticalSection(This->pin.pCritSec); + LeaveCriticalSection(pin->pin.pin.pCritSec); - return hr; + if (pin->their_src) + { + if (pin->flipfilter) + { + gst_pad_unlink(pin->their_src, pin->flip_sink); + gst_pad_unlink(pin->flip_src, pin->my_sink); + gst_object_unref(pin->flip_src); + gst_object_unref(pin->flip_sink); + pin->flipfilter = NULL; + pin->flip_src = pin->flip_sink = NULL; + } + else + gst_pad_unlink(pin->their_src, pin->my_sink); + gst_object_unref(pin->their_src); + } + gst_object_unref(pin->my_sink); + CloseHandle(pin->caps_event); + DeleteMediaType(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + gst_segment_free(pin->segment); + if (pin->gstpool) + gst_object_unref(pin->gstpool); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } static const IPinVtbl GST_OutputPin_Vtbl = { GSTOutPin_QueryInterface, - BasePinImpl_AddRef, + GSTOutPin_AddRef, GSTOutPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, @@ -1857,7 +1849,6 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI static HRESULT GST_RemoveOutputPins(GSTImpl *This) { - HRESULT hr; ULONG i; TRACE("(%p)\n", This); @@ -1871,11 +1862,9 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) gst_object_unref(This->their_sink); This->my_src = This->their_sink = NULL; - for (i = 0; i < This->cStreams; i++) { - hr = break_source_connection(&This->ppPins[i]->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface); - } + for (i = 0; i < This->cStreams; ++i) + free_source_pin(This->ppPins[i]); + This->cStreams = 0; CoTaskMemFree(This->ppPins); This->ppPins = NULL;

1 0

Zebediah Figura : winegstreamer: Share sink pin and filter reference counts.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 8d249e1863f3aee2b52633b199215103876880e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d249e1863f3aee2b52633b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:57 2019 -0500 winegstreamer: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 45 +++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2ec540a..3640fd9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1211,7 +1211,6 @@ static void gstdemux_destroy(BaseFilter *iface) { GSTImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); IPin *connected = NULL; - ULONG pinref; HRESULT hr; CloseHandle(filter->no_more_pads_event); @@ -1227,16 +1226,16 @@ static void gstdemux_destroy(BaseFilter *iface) hr = IPin_Disconnect(&filter->pInputPin.pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - if (pinref) - { - /* Valgrind could find this, if I kill it here */ - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - } + FreeMediaType(&filter->pInputPin.pin.mtCurrent); + if (filter->pInputPin.pAlloc) + IMemAllocator_Release(filter->pInputPin.pAlloc); + filter->pInputPin.pAlloc = NULL; + if (filter->pInputPin.pReader) + IAsyncReader_Release(filter->pInputPin.pReader); + filter->pInputPin.pReader = NULL; + filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; + if (filter->bus) { gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); @@ -1892,24 +1891,16 @@ static inline GSTInPin *impl_sink_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, GSTInPin, pin.IPin_iface); } -static ULONG WINAPI GSTInPin_Release(IPin *iface) +static ULONG WINAPI GSTInPin_AddRef(IPin *iface) { - GSTInPin *This = impl_sink_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); + GSTInPin *pin = impl_sink_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAlloc) - IMemAllocator_Release(This->pAlloc); - This->pAlloc = NULL; - if (This->pReader) - IAsyncReader_Release(This->pReader); - This->pReader = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - return 0; - } else - return refCount; +static ULONG WINAPI GSTInPin_Release(IPin *iface) +{ + GSTInPin *pin = impl_sink_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) @@ -2094,7 +2085,7 @@ static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppE static const IPinVtbl GST_InputPin_Vtbl = { GSTInPin_QueryInterface, - BasePinImpl_AddRef, + GSTInPin_AddRef, GSTInPin_Release, BaseInputPinImpl_Connect, GSTInPin_ReceiveConnection,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_gl_load_sysmem() in texture3d_load_location().
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 19470fc870649e385817b35cf9deb19feff8fb02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19470fc870649e385817b35c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:36 2019 +0430 wined3d: Use wined3d_texture_gl_load_sysmem() in texture3d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 47 ++++------------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 13ebd31..2971e45 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3266,6 +3266,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; @@ -3282,8 +3283,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3294,8 +3294,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3317,46 +3316,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in break; case WINED3D_LOCATION_SYSMEM: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {0, texture->resource.heap_memory}; - - data.addr += sub_resource->offset; - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - } - else - { - FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; - case WINED3D_LOCATION_BUFFER: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; - - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - } - else - { - FIXME("Implement WINED3D_LOCATION_BUFFER loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); default: FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location),

1 0

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

June 18, 2019

Module: wine Branch: master Commit: 50d8290b25c237e0c914d0b9cf7cee39802d91f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d8290b25c237e0c914d0b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:33 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_pause_transform_feedback(). 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 bc4e214..6bd6d43 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4101,19 +4101,18 @@ void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *contex } } -static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) +static void wined3d_context_gl_pause_transform_feedback(struct wined3d_context_gl *context_gl, BOOL force) { - 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->transform_feedback_active || context->transform_feedback_paused) + if (!context_gl->c.transform_feedback_active || context_gl->c.transform_feedback_paused) return; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) { GL_EXTCALL(glPauseTransformFeedback()); checkGLcall("glPauseTransformFeedback"); - context->transform_feedback_paused = 1; + context_gl->c.transform_feedback_paused = 1; return; } @@ -4833,7 +4832,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info = context->gl_info; if (!use_transform_feedback(state)) - context_pause_transform_feedback(context, TRUE); + wined3d_context_gl_pause_transform_feedback(context_gl, TRUE); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -5004,7 +5003,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } - context_pause_transform_feedback(context, FALSE); + wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); if (rasterizer_discard) {

1 0