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

Alexandre Julliard : tapi32: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 4dd9f585acee66bad289a3822884156e095778ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd9f585acee66bad289a382… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:05 2019 +0200 tapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/Makefile.in | 2 ++ dlls/tapi32/assisted.c | 8 ++------ dlls/tapi32/line.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index e8c5e58..1184e79 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -2,6 +2,8 @@ MODULE = tapi32.dll IMPORTLIB = tapi32 IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ assisted.c \ line.c \ diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 0d707db..298087d 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include "windef.h" @@ -30,7 +27,6 @@ #include "winreg.h" #include "objbase.h" #include "tapi.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -65,7 +61,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintfW( szlockey, locationW, currid); + swprintf( szlockey, ARRAY_SIZE(szlockey), locationW, currid); if( !RegOpenKeyW( hkey, szlockey, &hsubkey)) { if( citycode) { bufsize=sizeof(buf); @@ -79,7 +75,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) bufsize=sizeof(buf); if( !RegQueryValueExW( hsubkey, countryW, 0, &type, buf, &bufsize) && type == REG_DWORD) - snprintfW( countrycode, 8, fmtW, *(LPDWORD) buf ); + swprintf( countrycode, 8, fmtW, *(LPDWORD) buf ); else countrycode[0] = '\0'; } diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index d21fd91..a44ac1a 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "tapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -539,7 +538,7 @@ DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) HKEY hsubkey; if (RegEnumKeyW(hkey, i, subkey_name, max_subkey_len) != ERROR_SUCCESS) continue; - if (id && (atoiW(subkey_name) != id)) continue; + if (id && (wcstol(subkey_name, NULL, 10) != id)) continue; if (RegOpenKeyW(hkey, subkey_name, &hsubkey) != ERROR_SUCCESS) continue; RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, NULL, &size_int); @@ -566,7 +565,7 @@ DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) list->dwUsedSize += len + sizeof(LINECOUNTRYENTRY); if (id) i = 0; - entry[i].dwCountryID = atoiW(subkey_name); + entry[i].dwCountryID = wcstol(subkey_name, NULL, 10); size = sizeof(DWORD); RegQueryValueExW(hsubkey, country_codeW, NULL, NULL, (BYTE *)&entry[i].dwCountryCode, &size); entry[i].dwNextCountryID = 0;

1 0

Alexandre Julliard : typelib: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 663a0b33fb61d065e643f2aeb9953c84d6727bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=663a0b33fb61d065e643f2ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:12:19 2019 +0200 typelib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/typelib.dll16/Makefile.in | 2 +- dlls/typelib.dll16/typelib.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index b4d39ee..62c5b93 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll C_SRCS = typelib.c diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c index ee06cfb..50354a5 100644 --- a/dlls/typelib.dll16/typelib.c +++ b/dlls/typelib.dll16/typelib.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdlib.h> #include <string.h> #include <stdarg.h>

1 0

Alexandre Julliard : toolhelp: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 06252f931665276ce2a2f957c3588f4a6ade4c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06252f931665276ce2a2f957… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:11:12 2019 +0200 toolhelp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/toolhelp.dll16/Makefile.in | 2 +- dlls/toolhelp.dll16/toolhelp.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 64d0de3..3c9b33f 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = toolhelp.dll16 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = toolhelp.c diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 02e8d6a..f2b520b 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -19,14 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <ctype.h> #include <assert.h> #include "windef.h"

1 0

Alexandre Julliard : tdh: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: bae2395b14210cae32d1b30cd27e50dbe37ee86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae2395b14210cae32d1b30c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:35 2019 +0200 tdh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/Makefile.in | 2 ++ dlls/tdh/tdh_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in index 8979549..66bc18c 100644 --- a/dlls/tdh/Makefile.in +++ b/dlls/tdh/Makefile.in @@ -1,5 +1,7 @@ MODULE = tdh.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ tdh_main.c diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index c1885f8..29e7d50 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "ntstatus.h"

1 0

Zebediah Figura : quartz/memallocator: Clear some sample properties when freeing the sample.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: b9073b1e94d7be21cc2ee2ada888eb1f0a019c52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9073b1e94d7be21cc2ee2ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 21 22:35:41 2019 -0500 quartz/memallocator: Clear some sample properties when freeing the sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38421 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 7 +++++++ dlls/quartz/tests/memallocator.c | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 4e366f3..be973b3 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -492,6 +492,13 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) if (!ref) { + if (This->props.pMediaType) + DeleteMediaType(This->props.pMediaType); + This->props.pMediaType = NULL; + This->props.dwSampleFlags = 0; + This->tMediaStart = INVALID_MEDIA_TIME; + This->tMediaEnd = 0; + if (This->pParent) IMemAllocator_ReleaseBuffer(This->pParent, (IMediaSample *)iface); else diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 6f094c0..effb51d 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -324,13 +324,13 @@ static void test_sample_time(void) start = 0xdeadbeef; end = 0xdeadf00d; hr = IMediaSample_GetTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); - todo_wine ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); - todo_wine ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); + ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); + ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); start = 0x123; end = 0x321; @@ -338,7 +338,7 @@ static void test_sample_time(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); IMediaSample2_Release(sample2); IMediaSample_Release(sample); @@ -410,9 +410,9 @@ static void test_media_time(void) start = 0xdeadbeef; end = 0xdeadf00d; hr = IMediaSample_GetMediaTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); - todo_wine ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); - todo_wine ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); start = 0x123; end = 0x321; @@ -420,7 +420,7 @@ static void test_media_time(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetMediaTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); start = 0x123; end = 0x321; @@ -433,7 +433,7 @@ static void test_media_time(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetMediaTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); IMediaSample_Release(sample); IMemAllocator_Release(allocator); @@ -638,11 +638,11 @@ static void test_sample_properties(void) hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!props.dwTypeSpecificFlags, "Got type-specific flags %#x.\n", props.dwTypeSpecificFlags); - todo_wine ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); + ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); ok(props.lActual == 123, "Got actual length %d.\n", props.lActual); ok(!props.tStart, "Got sample start %s.\n", wine_dbgstr_longlong(props.tStart)); ok(!props.dwStreamId, "Got stream ID %#x.\n", props.dwStreamId); - todo_wine ok(!props.pMediaType, "Got media type %p.\n", props.pMediaType); + ok(!props.pMediaType, "Got media type %p.\n", props.pMediaType); ok(props.cbBuffer == 65536, "Got buffer length %d.\n", props.cbBuffer); IMediaSample2_Release(sample2);

1 0

Alexandre Julliard : t2embed: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: c7f2da4fd0fba0fa2c2513f185ba3da99a5d08e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f2da4fd0fba0fa2c2513f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:09:43 2019 +0200 t2embed: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/Makefile.in | 2 ++ dlls/t2embed/main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index baa4757..f2b0583 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -2,5 +2,7 @@ MODULE = t2embed.dll IMPORTLIB = t2embed IMPORTS = gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 288c19b..e478846 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -17,9 +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/filesource: Use strmbase filter state change methods.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: e145c56b5f4e85c400f8ea97a6c3ffaa85691c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e145c56b5f4e85c400f8ea97… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 21 22:35:39 2019 -0500 quartz/filesource: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 54 +++++++----------------------------------------- 1 file changed, 7 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2d4265d..a7063fe 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -87,11 +87,6 @@ static inline AsyncReader *impl_from_BaseFilter(BaseFilter *iface) return CONTAINING_RECORD(iface, AsyncReader, filter); } -static inline AsyncReader *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, AsyncReader, filter.IBaseFilter_iface); -} - static inline AsyncReader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) { return CONTAINING_RECORD(iface, AsyncReader, IFileSourceFilter_iface); @@ -500,50 +495,15 @@ HRESULT AsyncReader_create(IUnknown *outer, void **out) return S_OK; } -/** IMediaFilter methods **/ - -static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - - TRACE("%p->()\n", This); - - This->filter.state = State_Stopped; - - return S_OK; -} - -static HRESULT WINAPI AsyncReader_Pause(IBaseFilter * iface) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - - TRACE("%p->()\n", This); - - This->filter.state = State_Paused; - - return S_OK; -} - -static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - - TRACE("%p->(%s)\n", This, wine_dbgstr_longlong(tStart)); - - This->filter.state = State_Running; - - return S_OK; -} - static const IBaseFilterVtbl AsyncReader_Vtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - AsyncReader_Stop, - AsyncReader_Pause, - AsyncReader_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, @@ -697,12 +657,12 @@ static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface); } -static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *iface, const AM_MEDIA_TYPE *pmt) { - AM_MEDIA_TYPE *pmt_filter = impl_from_IBaseFilter(pin->pinInfo.pFilter)->pmt; + AsyncReader *filter = impl_from_BasePin(iface); - if (IsEqualGUID(&pmt->majortype, &pmt_filter->majortype) && - IsEqualGUID(&pmt->subtype, &pmt_filter->subtype)) + if (IsEqualGUID(&pmt->majortype, &filter->pmt->majortype) && + IsEqualGUID(&pmt->subtype, &filter->pmt->subtype)) return S_OK; return S_FALSE;

1 0

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

June 24, 2019

Module: wine Branch: master Commit: 5239000a9e0ddbc9da81e8f432d7f19264abec45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5239000a9e0ddbc9da81e8f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b664214..5aca952 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -196,10 +196,10 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } /* Context activation is done by the caller. */ -static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, + 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; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -269,7 +269,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -615,6 +615,9 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + switch (location) { case WINED3D_LOCATION_SYSMEM: @@ -626,7 +629,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - if (wined3d_buffer_gl(buffer)->buffer_object) + if (buffer_gl->buffer_object) return TRUE; if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) @@ -634,7 +637,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); return FALSE; } - return wined3d_buffer_gl_create_buffer_object(wined3d_buffer_gl(buffer), context); + return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); default: ERR("Invalid location %s.\n", wined3d_debug_location(location));

1 0

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

June 24, 2019

Module: wine Branch: master Commit: 1381d179f972cfd8c5d86f392a0e366b9783aec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381d179f972cfd8c5d86f39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8e1ac48..b664214 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,10 +133,8 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } @@ -200,6 +198,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu /* Context activation is done by the caller. */ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -228,7 +227,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -541,10 +540,11 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) { @@ -645,6 +645,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; @@ -680,7 +681,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); @@ -1011,6 +1012,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -1052,6 +1054,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) @@ -1070,7 +1073,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1168,12 +1171,14 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) {

1 0

Henri Verbeet : wined3d: Move texture2d_load_drawable() to texture.c.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 7fae37c0e178d62701b73eb99d748e7b62aa1e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fae37c0e178d62701b73eb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:20 2019 +0430 wined3d: Move texture2d_load_drawable() to texture.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 48 ----------------------------------------- dlls/wined3d/texture.c | 49 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 48 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6d3590b..fc8be38 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1423,54 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_drawable(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context) -{ - struct wined3d_texture *restore_texture; - struct wined3d_device *device; - unsigned int restore_idx; - unsigned int level; - RECT r; - - if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - { - DWORD current = texture->sub_resources[sub_resource_idx].locations; - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(current)); - return FALSE; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && wined3d_resource_is_offscreen(&texture->resource)) - { - ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); - return FALSE; - } - - device = texture->resource.device; - restore_texture = context->current_rt.texture; - restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) - context = context_acquire(device, texture, sub_resource_idx); - else - restore_texture = NULL; - - level = sub_resource_idx % texture->level_count; - SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level)); - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &r, - texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, - NULL, WINED3D_TEXF_POINT); - - if (restore_texture) - context_restore(context, restore_texture, restore_idx); - - return TRUE; -} - -/* Context activation is done by the caller. */ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ae3e179..4ae869b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2481,6 +2481,53 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl return FALSE; } +static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context) +{ + struct wined3d_texture *restore_texture; + struct wined3d_device *device; + unsigned int restore_idx; + unsigned int level; + RECT r; + + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + { + DWORD current = texture->sub_resources[sub_resource_idx].locations; + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(current)); + return FALSE; + } + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && wined3d_resource_is_offscreen(&texture->resource)) + { + ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); + return FALSE; + } + + device = texture->resource.device; + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) + context = context_acquire(device, texture, sub_resource_idx); + else + restore_texture = NULL; + + level = sub_resource_idx % texture->level_count; + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, + texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &r, + texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, + NULL, WINED3D_TEXF_POINT); + + if (restore_texture) + context_restore(context, restore_texture, restore_idx); + + return TRUE; +} + static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, BOOL srgb) { @@ -2651,7 +2698,7 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); case WINED3D_LOCATION_DRAWABLE: - return texture2d_load_drawable(texture, sub_resource_idx, context); + return wined3d_texture_load_drawable(texture, sub_resource_idx, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e23653..f796d12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3549,8 +3549,6 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const RECT *dst_rect) DECLSPEC_HIDDEN; void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; -BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx,

1 0