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

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: be5be587698d790f39d6963684618f823847c091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5be587698d790f39d69636… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:15:30 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 6 ++++-- dlls/wined3d/swapchain.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 603cf171e2..25e994c5fe 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -189,7 +189,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, return hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); adapter = dxgi_output->adapter; - IDXGIOutput_Release(output); TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); @@ -198,7 +197,10 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - return wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, adapter->ordinal, &mode); + hr = wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, + dxgi_output->wined3d_output, &mode); + IDXGIOutput_Release(output); + return hr; } static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index be41cc385e..312e8f2d24 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1452,14 +1452,15 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HWND window; HRESULT hr; - TRACE("state %p, wined3d %p, adapter_idx %u, mode %p.\n", state, wined3d, adapter_idx, mode); + TRACE("state %p, wined3d %p, output %p, mode %p.\n", state, wined3d, output, mode); wined3d_mutex_lock(); @@ -1479,7 +1480,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, adapter_idx, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1488,7 +1489,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } else { - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &actual_mode, NULL))) + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5c3efbdc8b..2dbb394444 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -282,7 +282,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b7b837d3e..265f6f885b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2762,7 +2762,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode); + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, struct wined3d_output *output, const struct wined3d_display_mode *mode);

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 3635e09dd51ae37331c1a33236bd026a36ffbef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3635e09dd51ae37331c1a332… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:02 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 312e8f2d24..65935a6165 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1430,19 +1430,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode) { HRESULT hr; if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1480,7 +1480,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1649,7 +1650,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) return hr; } else

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_set_adapter_display_mode() to wined3d_output_set_display_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 7161e01ad82f041fb719df969ffdcedcba07a0fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7161e01ad82f041fb719df96… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:16 2020 +0800 wined3d: Refactor wined3d_set_adapter_display_mode() to wined3d_output_set_display_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 4 ++-- dlls/wined3d/directx.c | 31 +++++++++++++------------------ dlls/wined3d/swapchain.c | 30 ++++++++++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 37 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7161e01ad82f041fb719…

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: aa177f6afcf93796a79c129ec713224abd541d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa177f6afcf93796a79c129e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:29 2020 +0800 wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 14 ++++++++++++-- dlls/ddraw/ddraw.c | 12 ++++++------ dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 25 +++++++++++-------------- dlls/wined3d/swapchain.c | 31 ++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 6 +++--- 11 files changed, 63 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa177f6afcf93796a79c…

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_find_closest_matching_adapter_mode() to wined3d_output_find_closest_matching_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: c51e97bc0d47ac61475a004c23f1e46fd93f3a39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c51e97bc0d47ac61475a004c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:48 2020 +0800 wined3d: Refactor wined3d_find_closest_matching_adapter_mode() to wined3d_output_find_closest_matching_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 7 +------ dlls/dxgi/swapchain.c | 9 ++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 17 ++++++++--------- dlls/wined3d/swapchain.c | 23 ++++++++++------------- dlls/wined3d/wined3d.spec | 6 +++--- dlls/wined3d/wined3d_main.c | 4 ++-- include/wine/wined3d.h | 11 +++++------ 8 files changed, 32 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c51e97bc0d47ac61475a…

1 0

Gabriel Ivăncescu : jscript: Use NULL in frame->this_obj for the global code object.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: fcba99c52ea781ebaeb581fa4e5b00ca2b62c8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcba99c52ea781ebaeb581fa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 6 15:48:38 2020 +0200 jscript: Use NULL in frame->this_obj for the global code object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7da8f707ed..3946d02da2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1218,12 +1218,15 @@ static HRESULT interp_call_member(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.1 */ static HRESULT interp_this(script_ctx_t *ctx) { - call_frame_t *frame = ctx->call_ctx; + IDispatch *this_obj = ctx->call_ctx->this_obj; TRACE("\n"); - IDispatch_AddRef(frame->this_obj); - return stack_push(ctx, jsval_disp(frame->this_obj)); + if(!this_obj) + this_obj = ctx->host_global ? ctx->host_global : to_disp(ctx->global); + + IDispatch_AddRef(this_obj); + return stack_push(ctx, jsval_disp(this_obj)); } static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigned flags) @@ -2700,7 +2703,7 @@ static void print_backtrace(script_ctx_t *ctx) WARN("%u\t", depth); depth++; - if(frame->this_obj && frame->this_obj != to_disp(ctx->global) && frame->this_obj != ctx->host_global) + if(frame->this_obj) WARN("%p->", frame->this_obj); WARN("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); if(frame->base_scope && frame->base_scope->frame) { @@ -3055,13 +3058,10 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; - if(this_obj) + if(this_obj) { frame->this_obj = this_obj; - else if(ctx->host_global) - frame->this_obj = ctx->host_global; - else - frame->this_obj = to_disp(ctx->global); - IDispatch_AddRef(frame->this_obj); + IDispatch_AddRef(frame->this_obj); + } if(function_instance) frame->function_instance = jsdisp_addref(function_instance);

1 0

Gabriel Ivăncescu : jscript: Lookup host global object on demand instead of storing it in script context.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: acb076c820dcacd41126f75373ec6019768e42e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb076c820dcacd41126f753… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 6 15:48:39 2020 +0200 jscript: Lookup host global object on demand instead of storing it in script context. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 17 ++++++++++++++++- dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 4 +--- dlls/jscript/jscript.c | 10 ---------- dlls/jscript/jscript.h | 2 -- dlls/jscript/tests/jscript.c | 2 -- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3946d02da2..ce7fbbc572 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -605,6 +605,21 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } +IDispatch *lookup_global_host(script_ctx_t *ctx) +{ + IDispatch *disp = NULL; + named_item_t *item; + + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { + if(!(item->flags & SCRIPTITEM_GLOBALMEMBERS)) continue; + disp = item->disp; + break; + } + if(!disp) disp = to_disp(ctx->global); + + return disp; +} + static int __cdecl local_ref_cmp(const void *key, const void *ref) { return wcscmp((const WCHAR*)key, ((const local_ref_t*)ref)->name); @@ -1223,7 +1238,7 @@ static HRESULT interp_this(script_ctx_t *ctx) TRACE("\n"); if(!this_obj) - this_obj = ctx->host_global ? ctx->host_global : to_disp(ctx->global); + this_obj = lookup_global_host(ctx); IDispatch_AddRef(this_obj); return stack_push(ctx, jsval_disp(this_obj)); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index cad46e12c5..7be98c51db 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -170,6 +170,7 @@ typedef struct _function_code_t { bytecode_t *bytecode; } function_code_t; +IDispatch *lookup_global_host(script_ctx_t*) DECLSPEC_HIDDEN; local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; struct _bytecode_t { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index baa5eb10d7..ef0de960ff 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -612,10 +612,8 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID if(this_disp) set_disp(&vthis, this_disp); - else if(ctx->host_global) - set_disp(&vthis, ctx->host_global); else - set_jsdisp(&vthis, ctx->global); + set_disp(&vthis, lookup_global_host(ctx)); hres = function->proc(ctx, &vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index b878aa5e2d..36d9f84d32 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -409,11 +409,6 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) case SCRIPTSTATE_INITIALIZED: clear_script_queue(This); - if(This->ctx->host_global) { - IDispatch_Release(This->ctx->host_global); - This->ctx->host_global = NULL; - } - while(!list_empty(&This->ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); @@ -820,11 +815,6 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, 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/jscript/jscript.h b/dlls/jscript/jscript.h index 7f34b55973..f9d6992704 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -422,8 +422,6 @@ struct _script_ctx_t { heap_pool_t tmp_heap; - IDispatch *host_global; - jsval_t *stack; unsigned stack_size; unsigned stack_top; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index a7dfd11347..8d4f6e1673 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1394,7 +1394,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"this", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var); @@ -1427,7 +1426,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"globalCode_this", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var);

1 0

Aaro Altonen : urlmon: Add URLOpenPullStreamW() stub.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 626e437c29c43d57a6d1d63f0d0fffca202c16ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=626e437c29c43d57a6d1d63f… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Fri Mar 6 15:25:37 2020 +0100 urlmon: Add URLOpenPullStreamW() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47535 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/umstream.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 01cc755c23..83767548cf 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -358,3 +358,13 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved return hr; } + +/*********************************************************************** + * URLOpenPullStreamW (URLMON.@) + */ +HRESULT WINAPI URLOpenPullStreamW(IUnknown *caller, const WCHAR *url, DWORD reserved, + IBindStatusCallback *callback) +{ + FIXME("%p %s %u %p, stub!\n", caller, debugstr_w(url), reserved, callback); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0d11ced0d4..ea3cd3814f 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -88,7 +88,7 @@ @ stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) @ stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) @ stub URLOpenPullStreamA -@ stub URLOpenPullStreamW +@ stdcall URLOpenPullStreamW(ptr wstr long ptr) @ stdcall URLOpenStreamA(ptr str long ptr) @ stdcall URLOpenStreamW(ptr wstr long ptr) @ stub UrlMkBuildVersion

1 0

Nikolay Sivov : mfplat: Remove extra critical section used in sample implementation.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 7f114274c0843bc7ec079a1eacea07466b2cdabc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f114274c0843bc7ec079a1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:32:25 2020 +0300 mfplat: Remove extra critical section used in sample implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 55 +++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 03037590ec..8e54a538f6 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -49,7 +49,6 @@ struct sample size_t buffer_count; size_t capacity; DWORD flags; - CRITICAL_SECTION cs; DWORD prop_flags; LONGLONG duration; LONGLONG timestamp; @@ -281,7 +280,6 @@ static ULONG WINAPI sample_Release(IMFSample *iface) for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); clear_attributes_object(&sample->attributes); - DeleteCriticalSection(&sample->cs); heap_free(sample->buffers); heap_free(sample); } @@ -566,9 +564,9 @@ static HRESULT WINAPI sample_GetSampleFlags(IMFSample *iface, DWORD *flags) TRACE("%p, %p.\n", iface, flags); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); *flags = sample->flags; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -579,9 +577,9 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) TRACE("%p, %#x.\n", iface, flags); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->flags = flags; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -593,12 +591,12 @@ static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp TRACE("%p, %p.\n", iface, timestamp); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) *timestamp = sample->timestamp; else hr = MF_E_NO_SAMPLE_TIMESTAMP; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -609,10 +607,10 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->timestamp = timestamp; sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -624,12 +622,12 @@ static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *durat TRACE("%p, %p.\n", iface, duration); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) *duration = sample->duration; else hr = MF_E_NO_SAMPLE_DURATION; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -640,10 +638,10 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->duration = duration; sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -657,9 +655,9 @@ static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) if (!count) return E_INVALIDARG; - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); *count = sample->buffer_count; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -671,7 +669,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF TRACE("%p, %u, %p.\n", iface, index, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) { *buffer = sample->buffers[index]; @@ -679,7 +677,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF } else hr = E_INVALIDARG; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -691,7 +689,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi TRACE("%p, %p.\n", iface, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->buffer_count == 0) hr = E_UNEXPECTED; @@ -706,7 +704,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi hr = E_NOTIMPL; } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -718,7 +716,7 @@ static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) TRACE("%p, %p.\n", iface, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (!mf_array_reserve((void **)&sample->buffers, &sample->capacity, sample->buffer_count + 1, sizeof(*sample->buffers))) hr = E_OUTOFMEMORY; @@ -727,7 +725,7 @@ static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) sample->buffers[sample->buffer_count++] = buffer; IMFMediaBuffer_AddRef(buffer); } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -739,7 +737,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) TRACE("%p, %u.\n", iface, index); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) { IMFMediaBuffer_Release(sample->buffers[index]); @@ -752,7 +750,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) } else hr = E_INVALIDARG; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -764,11 +762,11 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) TRACE("%p.\n", iface); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); sample->buffer_count = 0; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -783,13 +781,13 @@ static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_lengt *total_length = 0; - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) { if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) *total_length += length; } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -873,7 +871,6 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) } object->IMFSample_iface.lpVtbl = &samplevtbl; - InitializeCriticalSection(&object->cs); *sample = &object->IMFSample_iface;

1 0

Rémi Bernon : d3d9/tests: Register test window class upfront.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 3cca234835114b3f302e3cf7653668532373ade3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cca234835114b3f302e3cf7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 5 20:55:02 2020 +0100 d3d9/tests: Register test window class upfront. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d0967f0ac0..d143772686 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -123,12 +123,6 @@ out: static HWND create_window(void) { - WNDCLASSA wc = {0}; - - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); - return CreateWindowA("d3d9_test_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); } @@ -4911,6 +4905,7 @@ static void test_pinned_buffers(void) START_TEST(d3d9ex) { DEVMODEW current_mode; + WNDCLASSA wc = {0}; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -4937,6 +4932,10 @@ START_TEST(d3d9ex) return; } + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClassA(&wc); + test_qi_base_to_ex(); test_qi_ex_to_base(); test_swapchain_get_displaymode_ex(); @@ -4962,4 +4961,6 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + + UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0