February 2020 - Wine-Commits

Jacek Caban : vbscript: Lookup host global object in interp_me instead of storing it in script context.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: b4e89eec1729d325bd6ff0708fdba63dbd99ac84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4e89eec1729d325bd6ff070… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 17:26:21 2020 +0100 vbscript: Lookup host global object in interp_me instead of storing it in script context. Inspired by patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 19 +++++++++++++------ dlls/vbscript/vbscript.c | 10 ---------- dlls/vbscript/vbscript.h | 2 -- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 27a4aee9bd..d2e1d2a63f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1524,16 +1524,23 @@ static HRESULT interp_me(exec_ctx_t *ctx) TRACE("\n"); - if(ctx->vbthis) + if(ctx->vbthis) { disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; - else if(ctx->code->named_item) + }else if(ctx->code->named_item) { disp = (ctx->code->named_item->flags & SCRIPTITEM_CODEONLY) ? (IDispatch*)&ctx->code->named_item->script_obj->IDispatchEx_iface : ctx->code->named_item->disp; - else if(ctx->script->host_global) - disp = ctx->script->host_global; - else - disp = (IDispatch*)&ctx->script->script_obj->IDispatchEx_iface; + }else { + named_item_t *item; + disp = NULL; + LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { + if(!(item->flags & SCRIPTITEM_GLOBALMEMBERS)) continue; + disp = item->disp; + break; + } + if(!disp) + disp = (IDispatch*)&ctx->script->script_obj->IDispatchEx_iface; + } IDispatch_AddRef(disp); V_VT(&v) = VT_DISPATCH; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 27985bfc53..ea80911f10 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -283,11 +283,6 @@ static void release_script(script_ctx_t *ctx) release_named_item(iter); } - if(ctx->host_global) { - IDispatch_Release(ctx->host_global); - ctx->host_global = NULL; - } - if(ctx->secmgr) { IInternetHostSecurityManager_Release(ctx->secmgr); ctx->secmgr = NULL; @@ -675,11 +670,6 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr WARN("object does not implement IDispatch\n"); return hres; } - - if(This->ctx->host_global) - IDispatch_Release(This->ctx->host_global); - IDispatch_AddRef(disp); - This->ctx->host_global = disp; } item = heap_alloc(sizeof(*item)); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5860863a0c..27ddae3979 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -186,8 +186,6 @@ struct _script_ctx_t { IInternetHostSecurityManager *secmgr; DWORD safeopt; - IDispatch *host_global; - ScriptDisp *script_obj; BuiltinDisp *global_obj;

1 0

Nikolay Sivov : mf: Implement two-step session transition to running state.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 9122d73ccdacf506e03bcfdbcef17168bfe3328c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9122d73ccdacf506e03bcfdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:01:00 2020 +0300 mf: Implement two-step session transition to running state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 313 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 186 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9122d73ccdacf506e03b…

1 0

Nikolay Sivov : mf: Query for optional event generator for sinks.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: c61219625c64d03e5ff05a279e379e8bcda4ac74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c61219625c64d03e5ff05a27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:58 2020 +0300 mf: Query for optional event generator for sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 288ea60e6f..0bbf0bac56 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -107,6 +107,7 @@ struct media_sink { struct list entry; IMFMediaSink *sink; + IMFMediaEventGenerator *event_generator; }; struct output_node @@ -573,13 +574,14 @@ static void session_clear_presentation(struct media_session *session) heap_free(src_node); } - LIST_FOR_EACH_ENTRY_SAFE(sink, sink2, &session->presentation.sinks, struct media_sink, entry) { list_remove(&sink->entry); if (sink->sink) IMFMediaSink_Release(sink->sink); + if (sink->event_generator) + IMFMediaEventGenerator_Release(sink->event_generator); heap_free(sink); } } @@ -812,6 +814,8 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology media_sink->sink = sink; IMFMediaSink_AddRef(media_sink->sink); + IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaEventGenerator, (void **)&media_sink->event_generator); + list_add_tail(&session->presentation.sinks, &media_sink->entry); return S_OK;

1 0

Tag wine-5.3 : Alexandre Julliard : Release 5.3
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: refs/tags/wine-5.3 Tag: 164460a2cc177592691357241792919baaed794a URL: https://source.winehq.org/git/wine.git/?a=tag;h=164460a2cc17759269135724179… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 20:52:50 2020 +0100 Release 5.3

1 0

Alexandre Julliard : Release 5.3.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 1e478b804f72a9b5122fc6adafac5479b816885e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e478b804f72a9b5122fc6ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 20:52:50 2020 +0100 Release 5.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 963 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 450 insertions(+), 534 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e478b804f72a9b5122f…

1 0

Jacek Caban : winegcc: Don't pass ld command to winebuild when building PE file.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 747c46a4bc4376141bb43e80dab88e85d3e01e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=747c46a4bc4376141bb43e80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:52:40 2020 +0100 winegcc: Don't pass ld command to winebuild when building PE file. It's not used anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a5519352dd..20c72ec3c5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1157,7 +1157,7 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); - strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); + if (!is_pe) strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size)

1 0

Zebediah Figura : ddraw: Retrieve clip planes from the primary stateblock.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 8af7f54a1e6f54c40269291cece946f3841daf64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af7f54a1e6f54c40269291c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 18:48:45 2020 -0600 ddraw: Retrieve clip planes from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4284109237..b244a0309b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6576,27 +6576,24 @@ static HRESULT WINAPI d3d_device7_SetClipPlane_FPUPreserve(IDirect3DDevice7 *ifa static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - struct wined3d_vec4 *wined3d_plane; - HRESULT hr; TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane); if (!plane) return DDERR_INVALIDPARAMS; - wined3d_plane = (struct wined3d_vec4 *)plane; - wined3d_mutex_lock(); - hr = wined3d_device_get_clip_plane(device->wined3d_device, idx, wined3d_plane); - if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + if (idx < WINED3D_MAX_CLIP_DISTANCES) + memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[idx], sizeof(struct wined3d_vec4)); + else { WARN("Clip plane %u is not supported.\n", idx); - *wined3d_plane = device->user_clip_planes[idx]; - hr = D3D_OK; + if (idx < ARRAY_SIZE(device->user_clip_planes)) + memcpy(plane, &device->user_clip_planes[idx], sizeof(struct wined3d_vec4)); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_GetClipPlane_FPUSetup(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)

1 0

Matteo Bruni : wined3d: Optimize scanning changed texture states in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: ebc96e32bdb721f549cf7d704c19b0d762d3f147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc96e32bdb721f549cf7d70… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:24:59 2020 +0100 wined3d: Optimize scanning changed texture states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e706c830d3..9478c459e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3951,12 +3951,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + for (i = 0; i < ARRAY_SIZE(changed->textureState); ++i) { - for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + map = changed->textureState[i]; + while (map) { - if (changed->textureState[i] & (1u << j)) - wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + j = wined3d_bit_scan(&map); + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); } }

1 0

Matteo Bruni : wined3d: Optimize scanning changed sampler states in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: fcd51de66b06fad6f74a0abfaab985bf7b92e4cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd51de66b06fad6f74a0abf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:00 2020 +0100 wined3d: Optimize scanning changed sampler states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9478c459e0..863b483bab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3961,15 +3961,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + for (i = 0; i < ARRAY_SIZE(changed->samplerState); ++i) { DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + map = changed->samplerState[i]; + while (map) { - if (changed->samplerState[i] & (1 << j)) - wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + j = wined3d_bit_scan(&map); + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); } }

1 0

Nikolay Sivov : include: Add more Media Foundation error codes.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 0e8ea983bc8ae96d98b695400ca1353d88ea4e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8ea983bc8ae96d98b69540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:51 2020 +0300 include: Add more Media Foundation error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mferror.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/mferror.h b/include/mferror.h index 6341d832ab..523800d7f0 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -166,4 +166,46 @@ #define MF_E_CLOCK_NOT_SIMPLE _HRESULT_TYPEDEF_(0xc00d9c43) #define MF_S_CLOCK_STOPPED _HRESULT_TYPEDEF_(0x000d9c44) +#define MF_E_NO_MORE_DROP_MODES _HRESULT_TYPEDEF_(0xc00da028) +#define MF_E_NO_MORE_QUALITY_LEVELS _HRESULT_TYPEDEF_(0xc00da029) +#define MF_E_DROPTIME_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00da02a) +#define MF_E_QUALITYKNOB_WAIT_LONGER _HRESULT_TYPEDEF_(0xc00da02b) +#define MF_E_QM_INVALIDSTATE _HRESULT_TYPEDEF_(0xc00da02c) + +#define MF_E_TRANSCODE_NO_CONTAINERTYPE _HRESULT_TYPEDEF_(0xc00da410) +#define MF_E_TRANSCODE_PROFILE_NO_MATCHING_STREAMS _HRESULT_TYPEDEF_(0xc00da411) +#define MF_E_TRANSCODE_NO_MATCHING_ENCODER _HRESULT_TYPEDEF_(0xc00da412) +#define MF_E_TRANSCODE_INVALID_PROFILE _HRESULT_TYPEDEF_(0xc00da413) + +#define MF_E_ALLOCATOR_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00da7f8) +#define MF_E_ALLOCATOR_NOT_COMMITED _HRESULT_TYPEDEF_(0xc00da7f9) +#define MF_E_ALLOCATOR_ALREADY_COMMITED _HRESULT_TYPEDEF_(0xc00da7fa) +#define MF_E_STREAM_ERROR _HRESULT_TYPEDEF_(0xc00da7fb) +#define MF_E_INVALID_STREAM_STATE _HRESULT_TYPEDEF_(0xc00da7fc) +#define MF_E_HW_STREAM_NOT_CONNECTED _HRESULT_TYPEDEF_(0xc00da7fd) + +#define MF_E_NO_CAPTURE_DEVICES_AVAILABLE _HRESULT_TYPEDEF_(0xc00dabe0) +#define MF_E_CAPTURE_SINK_OUTPUT_NOT_SET _HRESULT_TYPEDEF_(0xc00dabe1) +#define MF_E_CAPTURE_SINK_MIRROR_ERROR _HRESULT_TYPEDEF_(0xc00dabe2) +#define MF_E_CAPTURE_SINK_ROTATE_ERROR _HRESULT_TYPEDEF_(0xc00dabe3) +#define MF_E_CAPTURE_ENGINE_INVALID_OP _HRESULT_TYPEDEF_(0xc00dabe4) +#define MF_E_CAPTURE_ENGINE_ALL_EFFECTS_REMOVED _HRESULT_TYPEDEF_(0xc00dabe5) +#define MF_E_CAPTURE_SOURCE_NO_INDEPENDENT_PHOTO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe6) +#define MF_E_CAPTURE_SOURCE_NO_VIDEO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe7) +#define MF_E_CAPTURE_SOURCE_NO_AUDIO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe8) +#define MF_E_CAPTURE_SOURCE_DEVICE_EXTENDEDPROP_OP_IN_PROGRESS _HRESULT_TYPEDEF_(0xc00dabe9) +#define MF_E_CAPTURE_PROPERTY_SET_DURING_PHOTO _HRESULT_TYPEDEF_(0xc00dabea) +#define MF_E_CAPTURE_NO_SAMPLES_IN_QUEUE _HRESULT_TYPEDEF_(0xc00dabeb) +#define MF_E_HW_ACCELERATED_THUMBNAIL_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00dabec) +#define MF_E_UNSUPPORTED_CAPTURE_DEVICE_PRESENT _HRESULT_TYPEDEF_(0xc00dabed) + +#define MF_E_TIMELINECONTROLLER_UNSUPPORTED_SOURCE_TYPE _HRESULT_TYPEDEF_(0xc00dafc8) +#define MF_E_TIMELINECONTROLLER_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00dafc9) +#define MF_E_TIMELINECONTROLLER_CANNOT_ATTACH _HRESULT_TYPEDEF_(0xc00dafca) + +#define MF_E_MEDIA_EXTENSION_APPSERVICE_CONNECTION_FAILED _HRESULT_TYPEDEF_(0xc00db3b0) +#define MF_E_MEDIA_EXTENSION_APPSERVICE_REQUEST_FAILED _HRESULT_TYPEDEF_(0xc00db3b1) +#define MF_E_MEDIA_EXTENSION_PACKAGE_INTEGRITY_CHECK_FAILED _HRESULT_TYPEDEF_(0xc00db3b2) +#define MF_E_MEDIA_EXTENSION_PACKAGE_LICENSE_INVALID _HRESULT_TYPEDEF_(0xc00db3b3) + #endif /* __WINE_MFERROR_H */

1 0