April 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mf: Create and initialize audio client for SAR stream.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: da6ad526e96690ae7b141077bea7b2bb93b50b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6ad526e96690ae7b141077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 16:43:01 2020 +0300 mf: Create and initialize audio client for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index ed59075fc2..752f7ceb1e 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -50,6 +50,8 @@ struct audio_renderer IMFMediaType *media_type; IMFMediaType *current_media_type; IMMDevice *device; + IAudioClient *audio_client; + HANDLE buffer_ready_event; BOOL is_shut_down; CRITICAL_SECTION cs; }; @@ -172,6 +174,9 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) IMFMediaType_Release(renderer->media_type); if (renderer->current_media_type) IMFMediaType_Release(renderer->current_media_type); + CloseHandle(renderer->buffer_ready_event); + if (renderer->audio_client) + IAudioClient_Release(renderer->audio_client); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -1110,6 +1115,52 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMF return S_OK; } +static HRESULT audio_renderer_create_audio_client(struct audio_renderer *renderer) +{ + WAVEFORMATEX *wfx; + HRESULT hr; + + if (renderer->audio_client) + { + IAudioClient_Release(renderer->audio_client); + renderer->audio_client = NULL; + } + + hr = IMMDevice_Activate(renderer->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, + (void **)&renderer->audio_client); + if (FAILED(hr)) + { + WARN("Failed to create audio client, hr %#x.\n", hr); + return hr; + } + + /* FIXME: use SAR configuration for flags and session id. */ + + /* FIXME: for now always use default format. */ + if (FAILED(hr = IAudioClient_GetMixFormat(renderer->audio_client, &wfx))) + { + WARN("Failed to get audio format, hr %#x.\n", hr); + return hr; + } + + hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, + 1000000, 0, wfx, NULL); + CoTaskMemFree(wfx); + if (FAILED(hr)) + { + WARN("Failed to initialize audio client, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = IAudioClient_SetEventHandle(renderer->audio_client, renderer->buffer_ready_event))) + { + WARN("Failed to set event handle, hr %#x.\n", hr); + return hr; + } + + return hr; +} + static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *media_type) { @@ -1130,6 +1181,8 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF IMFMediaType_Release(renderer->current_media_type); renderer->current_media_type = media_type; IMFMediaType_AddRef(renderer->current_media_type); + + hr = audio_renderer_create_audio_client(renderer); } else hr = MF_E_INVALIDMEDIATYPE; @@ -1249,6 +1302,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, renderer->IMFAudioPolicy_iface.lpVtbl = &audio_renderer_policy_vtbl; renderer->refcount = 1; InitializeCriticalSection(&renderer->cs); + renderer->buffer_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (FAILED(hr = MFCreateEventQueue(&renderer->event_queue))) goto failed;

1 0

Nikolay Sivov : mf: Handle state changes for SAR stream.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 0d201a215d8cbf9ac167dcb9e0ecb616e0116e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d201a215d8cbf9ac167dcb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 16:43:02 2020 +0300 mf: Handle state changes for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 38 ++++++++++++++++++- 2 files changed, 135 insertions(+), 10 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 752f7ceb1e..6c740abeba 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -31,6 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +enum stream_state +{ + STREAM_STATE_STOPPED = 0, + STREAM_STATE_RUNNING, + STREAM_STATE_PAUSED, +}; + struct audio_renderer { IMFMediaSink IMFMediaSink_iface; @@ -52,6 +59,7 @@ struct audio_renderer IMMDevice *device; IAudioClient *audio_client; HANDLE buffer_ready_event; + enum stream_state state; BOOL is_shut_down; CRITICAL_SECTION cs; }; @@ -504,30 +512,113 @@ static ULONG WINAPI audio_renderer_clock_sink_Release(IMFClockStateSink *iface) static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_client) + { + if (renderer->state == STREAM_STATE_STOPPED) + { + if (FAILED(hr = IAudioClient_Start(renderer->audio_client))) + WARN("Failed to start audio client, hr %#x.\n", hr); + renderer->state = STREAM_STATE_RUNNING; + } + } + else + hr = MF_E_NOT_INITIALIZED; + + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, hr, NULL); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_client) + { + if (renderer->state != STREAM_STATE_STOPPED) + { + if (SUCCEEDED(hr = IAudioClient_Stop(renderer->audio_client))) + { + if (FAILED(hr = IAudioClient_Reset(renderer->audio_client))) + WARN("Failed to reset audio client, hr %#x.\n", hr); + } + else + WARN("Failed to stop audio client, hr %#x.\n", hr); + renderer->state = STREAM_STATE_STOPPED; + } + } + else + hr = MF_E_NOT_INITIALIZED; + + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkStopped, &GUID_NULL, hr, NULL); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + if (renderer->state == STREAM_STATE_RUNNING) + { + if (renderer->audio_client) + { + if (FAILED(hr = IAudioClient_Stop(renderer->audio_client))) + WARN("Failed to stop audio client, hr %#x.\n", hr); + renderer->state = STREAM_STATE_PAUSED; + } + else + hr = MF_E_NOT_INITIALIZED; + + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkPaused, &GUID_NULL, hr, NULL); + } + else + hr = MF_E_INVALID_STATE_TRANSITION; + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_client) + { + if (renderer->state == STREAM_STATE_PAUSED) + { + if (FAILED(hr = IAudioClient_Start(renderer->audio_client))) + WARN("Failed to start audio client, hr %#x.\n", hr); + renderer->state = STREAM_STATE_RUNNING; + } + } + else + hr = MF_E_NOT_INITIALIZED; + + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, hr, NULL); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b7229b4f71..675bc0a443 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2811,9 +2811,13 @@ if (SUCCEEDED(hr)) IUnknown_Release(unk); /* Clock */ - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&unk); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + IMFClockStateSink_Release(state_sink); hr = IMFMediaSink_SetPresentationClock(sink, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2947,6 +2951,36 @@ todo_wine IMFMediaTypeHandler_Release(handler); + /* State change with initialized stream. */ + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(state_sink, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStop(state_sink, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStop(state_sink, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(state_sink, 0); + ok(hr == MF_E_INVALID_STATE_TRANSITION, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockRestart(state_sink, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockRestart(state_sink, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFClockStateSink_Release(state_sink); + IMFStreamSink_Release(stream_sink); /* Volume control */

1 0

Nikolay Sivov : mf: Implement prerolling for SAR stream.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 3368abd36c5fcea33cd65863d8abd496bf95ee77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3368abd36c5fcea33cd65863… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 16:43:03 2020 +0300 mf: Implement prerolling for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 6c740abeba..e426020a08 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -391,6 +391,14 @@ static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = audio_renderer_sink_Shutdown, }; +static void audio_renderer_preroll(struct audio_renderer *renderer) +{ + int i; + + for (i = 0; i < 2; ++i) + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); +} + static HRESULT WINAPI audio_renderer_preroll_QueryInterface(IMFMediaSinkPreroll *iface, REFIID riid, void **obj) { struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); @@ -411,9 +419,15 @@ static ULONG WINAPI audio_renderer_preroll_Release(IMFMediaSinkPreroll *iface) static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *iface, MFTIME start_time) { - FIXME("%p, %s.\n", iface, debugstr_time(start_time)); + struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(start_time)); + + if (renderer->is_shut_down) + return MF_E_SHUTDOWN; + + audio_renderer_preroll(renderer); + return IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); } static const IMFMediaSinkPrerollVtbl audio_renderer_preroll_vtbl =

1 0

Nikolay Sivov : mf: Send format invalidation event when new type is set for SAR stream.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 3af3375b97fc54db3ac385aa2d57986e19dcbf8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af3375b97fc54db3ac385aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 16:43:04 2020 +0300 mf: Send format invalidation event when new type is set for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e426020a08..d14a903eea 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1271,6 +1271,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF { struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); const unsigned int test_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + BOOL compare_result; unsigned int flags; HRESULT hr = S_OK; @@ -1287,7 +1288,16 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF renderer->current_media_type = media_type; IMFMediaType_AddRef(renderer->current_media_type); - hr = audio_renderer_create_audio_client(renderer); + if (SUCCEEDED(hr = audio_renderer_create_audio_client(renderer))) + { + if (SUCCEEDED(IMFMediaType_Compare(renderer->media_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, + &compare_result)) && !compare_result) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkFormatInvalidated, &GUID_NULL, + S_OK, NULL); + audio_renderer_preroll(renderer); + } + } } else hr = MF_E_INVALIDMEDIATYPE;

1 0

Jacek Caban : jscript: Support null this in Function.prototype.bind.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: edd4316492f05e42b72473a3a2a4948d62e40e3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd4316492f05e42b72473a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 21 17:43:46 2020 +0200 jscript: Support null this in Function.prototype.bind. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 13 +++++++++---- dlls/mshtml/tests/es5.js | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index caca274a49..e43d19464b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -439,6 +439,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + IDispatch *bound_this = NULL; FunctionInstance *function; jsdisp_t *new_function; HRESULT hres; @@ -453,12 +454,14 @@ static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_NOTIMPL; } - if(!is_object_instance(argv[0]) || !get_object(argv[0])) { + if(is_object_instance(argv[0])) { + bound_this = get_object(argv[0]); + }else if(!is_null(argv[0])) { FIXME("%s is not an object instance\n", debugstr_jsval(argv[0])); return E_NOTIMPL; } - hres = create_bind_function(ctx, function, get_object(argv[0]), argc - 1, argv + 1, &new_function); + hres = create_bind_function(ctx, function, bound_this, argc - 1, argv + 1, &new_function); if(FAILED(hres)) return hres; @@ -875,7 +878,8 @@ static void BindFunction_destructor(FunctionInstance *func) for(i = 0; i < function->argc; i++) jsval_release(function->args[i]); jsdisp_release(&function->target->dispex); - IDispatch_Release(function->this); + if(function->this) + IDispatch_Release(function->this); } static const function_vtbl_t BindFunctionVtbl = { @@ -899,7 +903,8 @@ static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, jsdisp_addref(&target->dispex); function->target = target; - IDispatch_AddRef(function->this = bound_this); + if(bound_this) + IDispatch_AddRef(function->this = bound_this); for(function->argc = 0; function->argc < argc; function->argc++) { hres = jsval_copy(argv[function->argc], function->args + function->argc); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6b5d04a959..a24f61fcd5 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -862,6 +862,9 @@ function test_bind() { f = (function() { return this; }).bind(a); ok(f() === a, "f() != a"); + f = (function() { return this; }).bind(null); + ok(f() === window, "f() = " + f()); + var t; f = (function() { return t = this; }).bind(a); ok(new f() === t, "new f() != a");

1 0

Jacek Caban : oleaut32/tests: Define NONAMELESSUNION.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 08894ffb114b9a01820f5bd63449db0e89f34c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08894ffb114b9a01820f5bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 21 19:25:15 2020 +0200 oleaut32/tests: Define NONAMELESSUNION. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 127af46ba1..8492a72085 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -26,6 +26,7 @@ #define COBJMACROS #define CONST_VTABLE +#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Jeff Smith : jscript/tests: Fix some function-to-string failure message typos.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: fd8e83eab08cb370849edc964d4054a1f428ef37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd8e83eab08cb370849edc96… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Apr 16 11:40:38 2020 -0500 jscript/tests: Fix some function-to-string failure message typos. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d4aa7f4383..df6ff785d0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2303,11 +2303,11 @@ ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_ ok(isNaN.toString() === "\nfunction isNaN() {\n [native code]\n}\n", "isNaN.toString = '" + isNaN.toString() + "'"); ok(Array.toString() === "\nfunction Array() {\n [native code]\n}\n", - "isNaN.toString = '" + Array.toString() + "'"); + "Array.toString = '" + Array.toString() + "'"); ok(Function.toString() === "\nfunction Function() {\n [native code]\n}\n", - "isNaN.toString = '" + Function.toString() + "'"); + "Function.toString = '" + Function.toString() + "'"); ok(Function.prototype.toString() === "\nfunction prototype() {\n [native code]\n}\n", - "isNaN.toString = '" + Function.prototype.toString() + "'"); + "Function.prototype.toString = '" + Function.prototype.toString() + "'"); ok("".substr.toString() === "\nfunction substr() {\n [native code]\n}\n", "''.substr.toString = '" + "".substr.toString() + "'");

1 0

Henri Verbeet : wined3d: Introduce a structure for OpenGL buffer objects.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 77fe33f5d9572292c94c672043d3ea68417b1e52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fe33f5d9572292c94c6720… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 22:55:09 2020 +0430 wined3d: Introduce a structure for OpenGL buffer objects. Analogous to the wined3d_bo_vk structure for Vulkan. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 12 +++--- dlls/wined3d/buffer.c | 16 ++++---- dlls/wined3d/context_gl.c | 84 ++++++++++++++++++++++++------------------ dlls/wined3d/state.c | 6 +-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 61 +++++++++++++++--------------- dlls/wined3d/view.c | 39 ++++++++++---------- dlls/wined3d/wined3d_private.h | 20 +++++++++- 8 files changed, 135 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77fe33f5d9572292c94c…

1 0

Henri Verbeet : wined3d: Store the preferred binding in the wined3d_bo_gl structure.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 1fb85cd5731aaa492df204df6b388ab7e992477c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb85cd5731aaa492df204df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 22:55:10 2020 +0430 wined3d: Store the preferred binding in the wined3d_bo_gl structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 22 ++++++++++------------ dlls/wined3d/texture.c | 7 ++++--- dlls/wined3d/view.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b7ba2be16d..a9d9d8fb71 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,7 +135,7 @@ 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_gl *context_gl) { - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->bo.id); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); } /* Context activation is done by the caller. */ @@ -225,6 +225,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf bo = &buffer_gl->bo; GL_EXTCALL(glGenBuffers(1, &bo->id)); + bo->binding = wined3d_buffer_gl_binding_from_bind_flags(gl_info, buffer_gl->b.resource.bind_flags); buffer_gl->b.buffer_object = (uintptr_t)bo; error = gl_info->gl_ops.gl.p_glGetError(); if (!bo->id || error != GL_NO_ERROR) @@ -248,17 +249,15 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, - GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, - GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(bo->binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(bo->binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE"); buffer_gl->b.flags |= WINED3D_BUFFER_APPLESYNC; } /* No setup is needed here for GL_ARB_map_buffer_range. */ } - GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, gl_usage)); + GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -803,7 +802,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, { wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, + GL_EXTCALL(glBufferData(buffer_gl->bo.binding, buffer_gl->b.resource.size, NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); return; @@ -854,7 +853,7 @@ drop_fence: gl_info->gl_ops.gl.p_glFinish(); wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->bo.binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } @@ -1172,7 +1171,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou wined3d_buffer_gl_bind(buffer_gl, context_gl); for (i = 0; i < range_count; ++i) { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->bo.binding, buffer->maps[i].offset, buffer->maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } @@ -1503,7 +1502,7 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, + GL_EXTCALL(glBufferSubData(buffer_gl->bo.binding, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("buffer upload"); @@ -1526,7 +1525,7 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, + GL_EXTCALL(glGetBufferSubData(buffer_gl->bo.binding, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("buffer download"); @@ -1561,7 +1560,6 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); else buffer_gl->b.flags |= WINED3D_BUFFER_USE_BO; - buffer_gl->buffer_type_hint = wined3d_buffer_gl_binding_from_bind_flags(gl_info, desc->bind_flags); return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e41c0f3999..d075ccc9cd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1638,9 +1638,10 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur return; GL_EXTCALL(glGenBuffers(1, &bo->id)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo->id)); - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, sub_resource->size, NULL, GL_STREAM_DRAW)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + bo->binding = GL_PIXEL_UNPACK_BUFFER; + GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); + GL_EXTCALL(glBufferData(bo->binding, sub_resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBindBuffer(bo->binding, 0)); checkGLcall("Create buffer object"); TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo->id, texture, sub_resource_idx); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1933942468..e1dd4de8da 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1032,8 +1032,8 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format->f, &offset, &size); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->bo.id); - GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, + wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); + GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); } @@ -1073,7 +1073,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = (uintptr_t)&view_gl->counter_bo; src.addr = NULL; - wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, + wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->bo.binding, &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); @@ -1102,9 +1102,9 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) static const GLuint initial_value = 0; GL_EXTCALL(glGenBuffers(1, &bo->id)); - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, bo->id)); - GL_EXTCALL(glBufferData(GL_ATOMIC_COUNTER_BUFFER, - sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); + bo->binding = GL_ATOMIC_COUNTER_BUFFER; + GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); + GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); checkGLcall("create atomic counter buffer"); } context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7f518b4d..e6cbfce17d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1522,6 +1522,7 @@ do { \ struct wined3d_bo_gl { GLuint id; + GLenum binding; }; static inline GLuint wined3d_bo_gl_id(uintptr_t bo) @@ -4422,7 +4423,6 @@ struct wined3d_buffer_gl struct wined3d_bo_gl bo; GLenum buffer_object_usage; - GLenum buffer_type_hint; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer)

1 0

Henri Verbeet : wined3d: Use the bo bindings in wined3d_context_gl_copy_bo_address().
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 97272f58ce49d1158be14f70e116866e1dd5d68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=97272f58ce49d1158be14f70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 22:55:11 2020 +0430 wined3d: Use the bo bindings in wined3d_context_gl_copy_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 9 +-------- dlls/wined3d/context_gl.c | 19 +++++++++---------- dlls/wined3d/view.c | 3 +-- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 49b9c7bcd9..ec8a2cadd2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4654,14 +4654,7 @@ static void adapter_gl_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) { - struct wined3d_context_gl *context_gl; - GLenum dst_binding, src_binding; - - context_gl = wined3d_context_gl(context); - dst_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, dst_bind_flags); - src_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, src_bind_flags); - - wined3d_context_gl_copy_bo_address(context_gl, dst, dst_binding, src, src_binding, size); + wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), dst, src, size); } static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f435c7e760..4e0af7474c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2581,8 +2581,7 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, } void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *dst, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *src_bo, *dst_bo; @@ -2605,27 +2604,27 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else { - src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_binding, WINED3D_MAP_READ); - dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_binding, WINED3D_MAP_WRITE); + src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_bo->binding, WINED3D_MAP_READ); + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_bo->binding, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); range.offset = 0; range.size = size; - wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding, 1, &range); - wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_bo->binding, 1, &range); + wined3d_context_gl_unmap_bo_address(context_gl, src, src_bo->binding, 0, NULL); } } else if (!dst_bo && src_bo) { - wined3d_context_gl_bind_bo(context_gl, src_binding, src_bo->id); - GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); + wined3d_context_gl_bind_bo(context_gl, src_bo->binding, src_bo->id); + GL_EXTCALL(glGetBufferSubData(src_bo->binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); } else if (dst_bo && !src_bo) { - wined3d_context_gl_bind_bo(context_gl, dst_binding, dst_bo->id); - GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); + wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); + GL_EXTCALL(glBufferSubData(dst_bo->binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); } else diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e1dd4de8da..cb0f2e2e25 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1073,8 +1073,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = (uintptr_t)&view_gl->counter_bo; src.addr = NULL; - wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->bo.binding, - &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); + wined3d_context_gl_copy_bo_address(context_gl, &dst, &src, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e6cbfce17d..8698620968 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2176,8 +2176,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *dst, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect,

1 0