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

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_raster_status() to wined3d_output_get_raster_status().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 2e7db80baddde577065150d862a0023a089d83fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7db80baddde577065150d8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 9 15:40:21 2020 +0800 wined3d: Refactor wined3d_get_adapter_raster_status() to wined3d_output_get_raster_status(). 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 | 11 ++++------- dlls/wined3d/swapchain.c | 12 ++++++++++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f947ca8b2b..17a02bbc05 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1824,7 +1824,7 @@ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *s return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = wined3d_get_adapter_raster_status(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &raster_status); + hr = wined3d_output_get_raster_status(ddraw->wined3d_output, &raster_status); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -2170,7 +2170,7 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) TRACE("iface %p, line %p.\n", iface, Scanline); wined3d_mutex_lock(); - hr = wined3d_get_adapter_raster_status(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &raster_status); + hr = wined3d_output_get_raster_status(ddraw->wined3d_output, &raster_status); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ca3053c89..f5a94b93aa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1392,7 +1392,7 @@ fail: return WINED3DERR_INVALIDCALL; } -HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_output_get_raster_status(const struct wined3d_output *output, struct wined3d_raster_status *raster_status) { LONGLONG freq_per_frame, freq_per_line; @@ -1401,11 +1401,9 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U static UINT once; if (!once++) - FIXME("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", - wined3d, adapter_idx, raster_status); + FIXME("output %p, raster_status %p semi-stub!\n", output, raster_status); else - WARN("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", - wined3d, adapter_idx, raster_status); + WARN("output %p, raster_status %p semi-stub!\n", output, raster_status); /* Obtaining the raster status is a widely implemented but optional * feature. When this method returns OK StarCraft 2 expects the @@ -1416,8 +1414,7 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) return WINED3DERR_INVALIDCALL; - if (FAILED(wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], &mode, - NULL))) + if (FAILED(wined3d_output_get_display_mode(output, &mode, NULL))) return WINED3DERR_INVALIDCALL; if (mode.refresh_rate == DEFAULT_REFRESH_RATE) mode.refresh_rate = 60; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c0eb25ffb6..c5fd2879c0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -307,10 +307,18 @@ struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapch HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { + struct wined3d_output *output; + TRACE("swapchain %p, raster_status %p.\n", swapchain, raster_status); - return wined3d_get_adapter_raster_status(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, raster_status); + output = wined3d_swapchain_get_output(swapchain); + if (!output) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + + return wined3d_output_get_raster_status(output, raster_status); } struct wined3d_swapchain_state * CDECL wined3d_swapchain_get_state(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 51745e2418..c426ffd0b6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,7 +12,6 @@ @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -@ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @@ -161,6 +160,7 @@ @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) +@ cdecl wined3d_output_get_raster_status(ptr ptr) @ cdecl wined3d_output_set_display_mode(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7691064f6e..12defa4f40 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2269,8 +2269,6 @@ struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); -HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, - struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2505,6 +2503,8 @@ HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, unsigned int mode_idx, struct wined3d_display_mode *mode); unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); +HRESULT __cdecl wined3d_output_get_raster_status(const struct wined3d_output *output, + struct wined3d_raster_status *raster_status); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, const struct wined3d_display_mode *mode);

1 0

Nikolay Sivov : mf: Partially implement sample copier transform.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 50af05674ce8959411a96a442800dd706939afe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50af05674ce8959411a96a44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 19:39:24 2020 +0300 mf: Partially implement sample copier transform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 544 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 271 ++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 817 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50af05674ce8959411a9…

1 0

Nikolay Sivov : include: Update MF resolver flags.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 6c3dbcdf436675bf5c297d7c451a1ba24bdfde95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c3dbcdf436675bf5c297d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 19:39:23 2020 +0300 include: Update MF resolver flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/include/mfidl.idl b/include/mfidl.idl index 82f69518df..fc9173864a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -925,13 +925,20 @@ interface IMFMediaSourceTopologyProvider : IUnknown HRESULT GetMediaSourceTopology([in] IMFPresentationDescriptor *pd, [out] IMFTopology **topology); } -cpp_quote("#define MF_RESOLUTION_MEDIASOURCE 0x00000001") -cpp_quote("#define MF_RESOLUTION_BYTESTREAM 0x00000002") -cpp_quote("#define MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE 0x00000010") -cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL 0x00000020") -cpp_quote("#define MF_RESOLUTION_READ 0x00010000") -cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") -cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") +enum +{ + MF_RESOLUTION_MEDIASOURCE = 0x00000001, + MF_RESOLUTION_BYTESTREAM = 0x00000002, + MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE = 0x00000010, + MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL = 0x00000020, + MF_RESOLUTION_DISABLE_LOCAL_PLUGINS = 0x00000040, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_APPROVED_ONLY = 0x00000080, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_WEB_ONLY = 0x00000100, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_WEB_ONLY_EDGEMODE = 0x00000200, + MF_RESOLUTION_ENABLE_STORE_PLUGINS = 0x00000400, + MF_RESOLUTION_READ = 0x00010000, + MF_RESOLUTION_WRITE = 0x00020000, +}; cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)")

1 0

Gabriel Ivăncescu : jscript/tests: Add test for function constructor in named item context.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: b526077189c3b7295bc6140d6250371db9c0ab10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b526077189c3b7295bc6140d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Mar 7 15:40:38 2020 +0200 jscript/tests: Add test for function constructor in named item 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/tests/jscript.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index be1320fa62..5de933e935 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1129,13 +1129,15 @@ static void test_named_items(void) static const WCHAR *context_idents[] = { L"testFunc", - L"testVar" + L"testVar", + L"testFuncConstr" }; static const WCHAR *context_code_test[] = { L"testFunc();", L"if(testVar != 42) throw new Error();", - L"if(Math.abs(-testVar) != 42) throw new Error();" + L"if(Math.abs(-testVar) != 42) throw new Error();", + L"if(testFuncConstr() != testVar) throw new Error();" }; IDispatchEx *dispex, *dispex2; IActiveScriptParse *parse; @@ -1302,7 +1304,8 @@ static void test_named_items(void) SET_EXPECT(GetIDsOfNames); hr = IActiveScriptParse_ParseScriptText(parse, L"" "var testVar = 42;\n" - "testVar_global = 5;\n", + "testVar_global = 5;\n" + "var testFuncConstr = new Function(\"return testVar;\");\n", L"codeOnlyItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript);

1 0

Gabriel Ivăncescu : jscript: Retrieve the proper script dispatch from the named item in GetScriptDispatch.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 335e0073c58ef2453dbd817e3ba08c4c2e18da63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=335e0073c58ef2453dbd817e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Mar 7 15:40:33 2020 +0200 jscript: Retrieve the proper script dispatch from the named item in GetScriptDispatch. 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/jscript.c | 10 +++++++++- dlls/jscript/tests/jscript.c | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 6281b20548..aabad7ef8b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -883,6 +883,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR IDispatch **ppdisp) { JScript *This = impl_from_IActiveScript(iface); + jsdisp_t *script_obj; TRACE("(%p)->(%s %p)\n", This, debugstr_w(pstrItemName), ppdisp); @@ -894,7 +895,14 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR return E_UNEXPECTED; } - *ppdisp = to_disp(This->ctx->global); + script_obj = This->ctx->global; + if(pstrItemName) { + named_item_t *item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) return E_INVALIDARG; + if(item->script_obj) script_obj = item->script_obj; + } + + *ppdisp = to_disp(script_obj); IDispatch_AddRef(*ppdisp); return S_OK; } diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 56b8cffb21..be1320fa62 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1183,6 +1183,11 @@ static void test_named_items(void) ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + hr = IActiveScript_GetScriptDispatch(script, L"noContext", &disp); + ok(hr == E_INVALIDARG, "GetScriptDispatch returned: %08x\n", hr); + hr = IActiveScript_GetScriptDispatch(script, L"codeONLYItem", &disp); + ok(hr == E_INVALIDARG, "GetScriptDispatch returned: %08x\n", hr); + SET_EXPECT(GetItemInfo_global_code); hr = IActiveScript_AddNamedItem(script, L"globalCodeItem", SCRIPTITEM_GLOBALMEMBERS | SCRIPTITEM_CODEONLY); ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr);

1 0

Zhiyi Zhang : wined3d: Introduce wined3d_output_get_adapter().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 744ff73829e037e2fa64d7a5c0881f33424563bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=744ff73829e037e2fa64d7a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 9 15:41:17 2020 +0800 wined3d: Introduce wined3d_output_get_adapter(). 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/directx.c | 7 +++++++ dlls/wined3d/wined3d.spec | 3 ++- include/wine/wined3d.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8053f9dc53..7419425d71 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1179,6 +1179,13 @@ HRESULT CDECL wined3d_output_find_closest_matching_mode(const struct wined3d_out return WINED3D_OK; } +struct wined3d_adapter * CDECL wined3d_output_get_adapter(const struct wined3d_output *output) +{ + TRACE("output %p.\n", output); + + return output->adapter; +} + HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d8ffdee9ac..472cd907b3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -157,12 +157,13 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) +@ cdecl wined3d_output_get_adapter(ptr) @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_get_raster_status(ptr ptr) -@ cdecl wined3d_output_set_display_mode(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) +@ cdecl wined3d_output_set_display_mode(ptr ptr) @ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_palette_create(ptr long long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3e05852640..09c6995de0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2497,6 +2497,7 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode); +struct wined3d_adapter * __cdecl wined3d_output_get_adapter(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output,

1 0

Dmitry Timoshkov : dnsapi/tests: Also test the "_ldap._tcp.deadbeef" query.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 2cefc54fed4da224acfd18a0026ac2ed59fe4736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cefc54fed4da224acfd18a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 9 10:58:27 2020 +0800 dnsapi/tests: Also test the "_ldap._tcp.deadbeef" query. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/query.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 5ec5181bd0..237dfd6ae7 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -38,10 +38,13 @@ static void test_DnsQuery(void) DNS_RECORDW *rec; DNS_STATUS status; - wcscpy(domain, L"_ldap._tcp.deadbeef"); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + wcscpy(domain, L"_ldap._tcp.deadbeef"); + status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + wcscpy(domain, L"_ldap._tcp.dc._msdcs."); size = ARRAY_SIZE(domain) - wcslen(domain); ret = GetComputerNameExW(ComputerNameDnsDomain, domain + wcslen(domain), &size);

1 0

Nikolay Sivov : mfplat: Add MFGetPlaneSize().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 673d9849345f733688f8536ae541c5a10c38b86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=673d9849345f733688f8536a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 19:39:25 2020 +0300 mfplat: Add MFGetPlaneSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 32 ++++++++++++++++++++++++++------ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ include/mfapi.h | 1 + 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 69b302ca89..6b67f5b33c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1737,10 +1737,7 @@ static int __cdecl uncompressed_video_format_compare(const void *a, const void * return memcmp(guid, format->subtype, sizeof(*guid)); } -/*********************************************************************** - * MFCalculateImageSize (mfplat.@) - */ -HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) +static HRESULT mf_get_image_size(REFGUID subtype, unsigned int width, unsigned int height, unsigned int *size) { static const struct uncompressed_video_format video_formats[] = { @@ -1755,8 +1752,6 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height }; struct uncompressed_video_format *format; - TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); - format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), uncompressed_video_format_compare); if (format) @@ -1771,6 +1766,31 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height return format ? S_OK : E_INVALIDARG; } +/*********************************************************************** + * MFCalculateImageSize (mfplat.@) + */ +HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) +{ + TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); + + return mf_get_image_size(subtype, width, height, size); +} + +/*********************************************************************** + * MFGetPlaneSize (mfplat.@) + */ +HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size) +{ + GUID subtype; + + TRACE("%#x, %u, %u, %p.\n", format, width, height, size); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = format; + + return mf_get_image_size(&subtype, width, height, size); +} + /*********************************************************************** * MFCompareFullToPartialMediaType (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 7e3bd4571c..1e11a1fc2a 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -96,7 +96,7 @@ @ stub MFGetConfigurationString @ stub MFGetMFTMerit @ stub MFGetNumericNameFromSockaddr -@ stub MFGetPlaneSize +@ stdcall MFGetPlaneSize(long long long ptr) @ stub MFGetPlatform @ stdcall MFGetPluginControl(ptr) @ stub MFGetPrivateWorkqueues diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a93bbfe7f1..36fe9dc831 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -91,6 +91,7 @@ static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); static HRESULT (WINAPI *pMFTEnumEx)(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count); +static HRESULT (WINAPI *pMFGetPlaneSize)(DWORD format, DWORD width, DWORD height, DWORD *size); static const WCHAR fileschemeW[] = L"file://"; @@ -662,6 +663,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFCreateTransformActivate); + X(MFGetPlaneSize); X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); @@ -3184,6 +3186,9 @@ static void test_MFCalculateImageSize(void) UINT32 size; HRESULT hr; + if (!pMFGetPlaneSize) + win_skip("MFGetPlaneSize() is not available.\n"); + size = 1; hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); @@ -3200,6 +3205,15 @@ static void test_MFCalculateImageSize(void) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, image_size_tests[i].size); + + if (pMFGetPlaneSize) + { + hr = pMFGetPlaneSize(image_size_tests[i].subtype->Data1, image_size_tests[i].width, image_size_tests[i].height, + &size); + ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); + ok(size == image_size_tests[i].size, "%u: unexpected plane size %u, expected %u.\n", i, size, + image_size_tests[i].size); + } } } diff --git a/include/mfapi.h b/include/mfapi.h index 6636057daa..38577cfe62 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -421,6 +421,7 @@ void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllo void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size); +HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes,

1 0

Gabriel Ivăncescu : jscript: Add stub implementation of separate script dispatches for named items.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: c2a5aa7d3791f867fb0e833dc3f43e3d6638dd3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a5aa7d3791f867fb0e833d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Mar 7 15:40:32 2020 +0200 jscript: Add stub implementation of separate script dispatches for named items. 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 | 7 +++++++ dlls/jscript/jscript.c | 34 ++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 2 ++ 3 files changed, 43 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ce7fbbc572..5b9689505c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2990,6 +2990,13 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi unsigned i; HRESULT hres; + if(bytecode->named_item) { + if(!bytecode->named_item->script_obj) { + hres = create_named_item_script_obj(ctx, bytecode->named_item); + if(FAILED(hres)) return hres; + } + } + if(!ctx->ei->enter_notified) { ctx->ei->enter_notified = TRUE; IActiveScriptSite_OnEnterScript(ctx->site); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 694ea8b71a..6281b20548 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -108,6 +108,22 @@ static inline BOOL is_started(script_ctx_t *ctx) || ctx->state == SCRIPTSTATE_DISCONNECTED; } +HRESULT create_named_item_script_obj(script_ctx_t *ctx, named_item_t *item) +{ + /* FIXME: Create a separate script dispatch instead of using the global */ + item->script_obj = ctx->global; + IDispatchEx_AddRef(&item->script_obj->IDispatchEx_iface); + return S_OK; +} + +static void release_named_item_script_obj(named_item_t *item) +{ + if(!item->script_obj) return; + + jsdisp_release(item->script_obj); + item->script_obj = NULL; +} + named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsigned flags) { named_item_t *item; @@ -115,6 +131,10 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { if((item->flags & flags) == flags && !wcscmp(item->name, item_name)) { + if(!item->script_obj && !(item->flags & SCRIPTITEM_GLOBALMEMBERS)) { + hr = create_named_item_script_obj(ctx, item); + if(FAILED(hr)) return NULL; + } if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { IUnknown *unk; @@ -371,6 +391,15 @@ static void clear_persistent_code_list(JScript *This) } } +static void release_persistent_script_objs(JScript *This) +{ + bytecode_t *iter; + + LIST_FOR_EACH_ENTRY(iter, &This->persistent_code, bytecode_t, entry) + if(iter->named_item) + release_named_item_script_obj(iter->named_item); +} + static void exec_queued_code(JScript *This) { bytecode_t *iter; @@ -408,6 +437,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: clear_script_queue(This); + release_persistent_script_objs(This); while(!list_empty(&This->ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); @@ -415,6 +445,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) list_remove(&iter->entry); if(iter->disp) IDispatch_Release(iter->disp); + release_named_item_script_obj(iter); release_named_item(iter); } @@ -827,6 +858,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, item->ref = 1; item->disp = disp; item->flags = dwFlags; + item->script_obj = NULL; item->name = heap_strdupW(pstrName); if(!item->name) { if(disp) @@ -1001,6 +1033,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, WARN("Unknown context %s\n", debugstr_w(pstrItemName)); return E_INVALIDARG; } + if(!item->script_obj) item = NULL; } enter_script(This->ctx, &ei); @@ -1103,6 +1136,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars WARN("Unknown context %s\n", debugstr_w(pstrItemName)); return E_INVALIDARG; } + if(!item->script_obj) item = NULL; } enter_script(This->ctx, &ei); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f9d6992704..804f95eff0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -205,6 +205,7 @@ typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t); HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) DECLSPEC_HIDDEN; typedef struct named_item_t { + jsdisp_t *script_obj; IDispatch *disp; unsigned ref; DWORD flags; @@ -213,6 +214,7 @@ typedef struct named_item_t { struct list entry; } named_item_t; +HRESULT create_named_item_script_obj(script_ctx_t*,named_item_t*) DECLSPEC_HIDDEN; named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void release_named_item(named_item_t*) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : jscript: Lookup the named item and keep a ref to it from the associated bytecode.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: f6201b4b119383d7e97ec3d412a2df0540734dfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6201b4b119383d7e97ec3d4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Mar 7 15:40:31 2020 +0200 jscript: Lookup the named item and keep a ref to it from the associated bytecode. 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/compile.c | 10 +++++++++- dlls/jscript/engine.h | 3 ++- dlls/jscript/function.c | 3 ++- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 22 ++++++++++++++++++++-- dlls/jscript/tests/jscript.c | 3 +++ 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 61db10cd41..5ac93c9f2f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2250,6 +2250,8 @@ void release_bytecode(bytecode_t *code) for(i=0; i < code->str_cnt; i++) jsstr_release(code->str_pool[i]); + if(code->named_item) + release_named_item(code->named_item); heap_free(code->source); heap_pool_free(&code->heap); heap_free(code->bstr_pool); @@ -2485,7 +2487,8 @@ static HRESULT compile_arguments(compiler_ctx_t *ctx, const WCHAR *args) } HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_context, unsigned start_line, - const WCHAR *args, const WCHAR *delimiter, BOOL from_eval, BOOL use_decode, bytecode_t **ret) + const WCHAR *args, const WCHAR *delimiter, BOOL from_eval, BOOL use_decode, + named_item_t *named_item, bytecode_t **ret) { compiler_ctx_t compiler = {0}; HRESULT hres; @@ -2526,6 +2529,11 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte return DISP_E_EXCEPTION; } + if(named_item) { + compiler.code->named_item = named_item; + named_item->ref++; + } + *ret = compiler.code; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7be98c51db..fe6b2a06d0 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -181,6 +181,7 @@ struct _bytecode_t { heap_pool_t heap; function_code_t global_code; + named_item_t *named_item; WCHAR *source; UINT64 source_context; @@ -197,7 +198,7 @@ struct _bytecode_t { struct list entry; }; -HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,named_item_t*,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; static inline bytecode_t *bytecode_addref(bytecode_t *code) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ef0de960ff..007aec0370 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -982,7 +982,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg if(FAILED(hres)) return hres; - hres = compile_script(ctx, str, 0, 0, NULL, NULL, FALSE, FALSE, &code); + hres = compile_script(ctx, str, 0, 0, NULL, NULL, FALSE, FALSE, + ctx->call_ctx ? ctx->call_ctx->bytecode->named_item : NULL, &code); heap_free(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index e2758bfc66..2a1dcb2b84 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -204,7 +204,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return E_OUTOFMEMORY; TRACE("parsing %s\n", debugstr_jsval(argv[0])); - hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, &code); + hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, frame ? frame->bytecode->named_item : NULL, &code); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 36d9f84d32..694ea8b71a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -983,6 +983,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { JScript *This = impl_from_IActiveScriptParse(iface); + named_item_t *item = NULL; bytecode_t *code; jsexcept_t ei; HRESULT hres; @@ -994,9 +995,17 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; + if(pstrItemName) { + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); + return E_INVALIDARG; + } + } + enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLine, NULL, pstrDelimiter, - (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, This->is_encode, &code); + (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, This->is_encode, item, &code); if(FAILED(hres)) return leave_script(This->ctx, hres); @@ -1075,6 +1084,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { JScript *This = impl_from_IActiveScriptParseProcedure2(iface); + named_item_t *item = NULL; bytecode_t *code; jsdisp_t *dispex; jsexcept_t ei; @@ -1087,9 +1097,17 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; + if(pstrItemName) { + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); + return E_INVALIDARG; + } + } + enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, - pstrDelimiter, FALSE, This->is_encode, &code); + pstrDelimiter, FALSE, This->is_encode, item, &code); if(SUCCEEDED(hres)) hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); release_bytecode(code); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8d4f6e1673..56b8cffb21 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1267,6 +1267,9 @@ static void test_named_items(void) parse_script(parse, L"visibleItem.testCall();"); CHECK_CALLED(testCall); + hr = IActiveScriptParse_ParseScriptText(parse, L"function testFunc() { }", L"CodeOnlyItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "ParseScriptText returned: %08x\n", hr); + SET_EXPECT(OnEnterScript); SET_EXPECT(GetIDsOfNames); SET_EXPECT(OnLeaveScript);

1 0