wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Rémi Bernon : qasf: Constify filter_ops.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 71b136384b208e85be362d523cc4cc7be9aff202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b136384b208e85be362d52… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:46:55 2022 +0200 qasf: Constify filter_ops. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index a037728079f..ba782f19ad9 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -66,7 +66,7 @@ static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID return E_NOINTERFACE; } -static struct strmbase_filter_ops filter_ops = +static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = asf_reader_get_pin, .filter_destroy = asf_reader_destroy,

1 0

Rémi Bernon : qasf/tests: Add more ASF Reader filter tests.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 031747a5aaa7614a3982cda14a1714fc9b54d2f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=031747a5aaa7614a3982cda1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 18:02:38 2022 +0100 qasf/tests: Add more ASF Reader filter tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/tests/Makefile.in | 2 + dlls/qasf/tests/asfreader.c | 234 +++++++++++++++++++++++++++++++++++++++++++- dlls/qasf/tests/resource.rc | 25 +++++ dlls/qasf/tests/test.wmv | Bin 0 -> 45663 bytes 4 files changed, 257 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=031747a5aaa7614a3982…

1 0

Brendan Shanks : win32u: Fix typo in NtUserGetIconInfo.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: b88ba537ea879772dc86fc8b811523744795b22d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b88ba537ea879772dc86fc8b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 24 12:38:32 2022 -0700 win32u: Fix typo in NtUserGetIconInfo. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/win32u/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 032110b26d0..e51feb87115 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -600,7 +600,7 @@ BOOL WINAPI NtUserGetIconInfo( HICON icon, ICONINFO *info, UNICODE_STRING *modul { size_t size = min( res_name->MaximumLength, lstrlenW( obj->resname) * sizeof(WCHAR) ); if (size) memcpy( res_name->Buffer, obj->resname, size ); - module->Length = size / sizeof(WCHAR); /* length in chars, not bytes */ + res_name->Length = size / sizeof(WCHAR); /* length in chars, not bytes */ } } }

1 0

Zhiyi Zhang : light.msstyles: Add Menu parts.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: b90662e695c512de1d4476d7ff15004e4f1e2497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90662e695c512de1d4476d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:37 2022 +0800 light.msstyles: Add Menu parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53034 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 ++ dlls/light.msstyles/blue_menu_popup_check_16px.bmp | Bin 0 -> 4234 bytes dlls/light.msstyles/blue_menu_popup_check_16px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_check_18px.bmp | Bin 0 -> 5322 bytes dlls/light.msstyles/blue_menu_popup_check_18px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_separator.bmp | Bin 0 -> 162 bytes dlls/light.msstyles/blue_menu_popup_separator.svg | 5 + dlls/light.msstyles/blue_menu_popup_submenu.bmp | Bin 0 -> 786 bytes dlls/light.msstyles/blue_menu_popup_submenu.svg | 9 ++ dlls/light.msstyles/blue_menu_system_close.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_close.svg | 5 + dlls/light.msstyles/blue_menu_system_maximize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_maximize.svg | 5 + dlls/light.msstyles/blue_menu_system_minimize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_minimize.svg | 5 + dlls/light.msstyles/blue_menu_system_restore.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_restore.svg | 15 ++ dlls/light.msstyles/light.rc | 154 +++++++++++++++++++++ 18 files changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b90662e695c512de1d44…

1 0

Zhiyi Zhang : uxtheme: Support parsing menu class.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 7e48747bd67f8dcd47a0f5754d73b4b231fa723c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e48747bd67f8dcd47a0f575… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:28 2022 +0800 uxtheme: Support parsing menu class. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index afeda659a36..07fafbe0bde 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -485,6 +485,59 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classMenu[] = { + {MENU_MENUITEM_TMSCHEMA, 0, L"MENUITEM"}, + {MENU_MENUDROPDOWN_TMSCHEMA, 0, L"MENUDROPDOWN"}, + {MENU_MENUBARITEM_TMSCHEMA, 0, L"MENUBARITEM"}, + {MENU_MENUBARDROPDOWN_TMSCHEMA, 0, L"MENUBARDROPDOWN"}, + {MENU_CHEVRON_TMSCHEMA, 0, L"CHEVRON"}, + {MENU_SEPARATOR_TMSCHEMA, 0, L"SEPARATOR"}, + {MENU_BARBACKGROUND, 0, L"BARBACKGROUND"}, + {MENU_BARBACKGROUND, MB_ACTIVE, L"ACTIVE"}, + {MENU_BARBACKGROUND, MB_INACTIVE, L"INACTIVE"}, + {MENU_BARITEM, 0, L"BARITEM"}, + {MENU_BARITEM, MBI_NORMAL, L"NORMAL"}, + {MENU_BARITEM, MBI_HOT, L"HOT"}, + {MENU_BARITEM, MBI_PUSHED, L"PUSHED"}, + {MENU_BARITEM, MBI_DISABLED, L"DISABLED"}, + {MENU_BARITEM, MBI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_BARITEM, MBI_DISABLEDPUSHED, L"DISABLEDPUSHED"}, + {MENU_POPUPBACKGROUND, 0, L"POPUPBACKGROUND"}, + {MENU_POPUPBORDERS, 0, L"POPUPBORDERS"}, + {MENU_POPUPCHECK, 0, L"POPUPCHECK"}, + {MENU_POPUPCHECK, MC_CHECKMARKNORMAL, L"CHECKMARKNORMAL"}, + {MENU_POPUPCHECK, MC_CHECKMARKDISABLED, L"CHECKMARKDISABLED"}, + {MENU_POPUPCHECK, MC_BULLETNORMAL, L"BULLETNORMAL"}, + {MENU_POPUPCHECK, MC_BULLETDISABLED, L"BULLETDISABLED"}, + {MENU_POPUPCHECKBACKGROUND, 0, L"POPUPCHECKBACKGROUND"}, + {MENU_POPUPCHECKBACKGROUND, MCB_DISABLED, L"DISABLED"}, + {MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, L"NORMAL"}, + {MENU_POPUPCHECKBACKGROUND, MCB_BITMAP, L"BITMAP"}, + {MENU_POPUPGUTTER, 0, L"POPUPGUTTER"}, + {MENU_POPUPITEM, 0, L"POPUPITEM"}, + {MENU_POPUPITEM, MPI_NORMAL, L"NORMAL"}, + {MENU_POPUPITEM, MPI_HOT, L"HOT"}, + {MENU_POPUPITEM, MPI_DISABLED, L"DISABLED"}, + {MENU_POPUPITEM, MPI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_POPUPSEPARATOR, 0, L"POPUPSEPARATOR"}, + {MENU_POPUPSUBMENU, 0, L"POPUPSUBMENU"}, + {MENU_POPUPSUBMENU, MSM_NORMAL, L"NORMAL"}, + {MENU_POPUPSUBMENU, MSM_DISABLED, L"DISABLED"}, + {MENU_SYSTEMCLOSE, 0, L"SYSTEMCLOSE"}, + {MENU_SYSTEMCLOSE, MSYSC_NORMAL, L"NORMAL"}, + {MENU_SYSTEMCLOSE, MSYSC_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMAXIMIZE, 0, L"SYSTEMMAXIMIZE"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMINIMIZE, 0, L"SYSTEMMINIMIZE"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_DISABLED, L"DISABLED"}, + {MENU_SYSTEMRESTORE, 0, L"SYSTEMRESTORE"}, + {MENU_SYSTEMRESTORE, MSYSR_NORMAL, L"NORMAL"}, + {MENU_SYSTEMRESTORE, MSYSR_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1020,6 +1073,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, + {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"},

1 0

Rémi Bernon : widl: Remove set but unused variable.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: d81589371d424502bdf90b3135d22e7ed8df78bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81589371d424502bdf90b31… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 10:06:05 2022 +0200 widl: Remove set but unused variable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index abeb37f34a4..457b20df259 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1056,7 +1056,7 @@ static int encode_var( var, type, type->name ? type->name : "NULL"); if (is_array(type) && !type_array_is_decl_as_ptr(type)) { - int num_dims, elements = 1, arrayoffset; + int num_dims, arrayoffset; type_t *atype; int *arraydata; @@ -1083,7 +1083,6 @@ static int encode_var( arraydata[0] = type_array_get_dim(atype); arraydata[1] = 0; arraydata += 2; - elements *= type_array_get_dim(atype); } typeoffset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEDESC, 8, 0);

1 0

Nikolay Sivov : d2d1/effect: Add a helper to append shader objects to the context.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 5317f869e09a84d5f4f9ee3d743c446e0f3cced4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5317f869e09a84d5f4f9ee3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 25 10:29:13 2022 +0300 d2d1/effect: Add a helper to append shader objects to the context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index ff808475a78..79d704dd949 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -37,18 +37,35 @@ static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1Effec static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context) { - unsigned int i; + size_t i; for (i = 0; i < effect_context->shader_count; ++i) - { - if (effect_context->shaders[i].shader) - IUnknown_Release(effect_context->shaders[i].shader); - } + IUnknown_Release(effect_context->shaders[i].shader); heap_free(effect_context->shaders); ID2D1DeviceContext_Release(&effect_context->device_context->ID2D1DeviceContext_iface); } +static HRESULT d2d_effect_context_add_shader(struct d2d_effect_context *effect_context, + REFGUID shader_id, void *shader) +{ + struct d2d_shader *entry; + + if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, + effect_context->shader_count + 1, sizeof(*effect_context->shaders))) + { + WARN("Failed to resize shaders array.\n"); + return E_OUTOFMEMORY; + } + + entry = &effect_context->shaders[effect_context->shader_count++]; + entry->id = *shader_id; + entry->shader = shader; + IUnknown_AddRef(entry->shader); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -189,7 +206,6 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); ID3D11VertexShader *vertex_shader; - struct d2d_shader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", @@ -205,22 +221,10 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect return hr; } - if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, - effect_context->shader_count + 1, sizeof(*effect_context->shaders))) - { - ERR("Failed to resize shaders array.\n"); - ID3D11VertexShader_Release(vertex_shader); - return E_OUTOFMEMORY; - } - memset(effect_context->shaders + effect_context->shader_count, 0, - sizeof(*effect_context->shaders) * (effect_context->shaders_size - effect_context->shader_count)); + hr = d2d_effect_context_add_shader(effect_context, shader_id, vertex_shader); + ID3D11VertexShader_Release(vertex_shader); - effect_context->shader_count++; - shader = &effect_context->shaders[effect_context->shader_count - 1]; - shader->id = *shader_id; - shader->shader = (IUnknown *)vertex_shader; - - return S_OK; + return hr; } static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface,

1 0

Ziqing Hui : d2d1: Implement ID2D1EffectContext_IsShaderLoaded().
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 35c4117b244a5cd1b074de71979d46060934454d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c4117b244a5cd1b074de71… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 25 10:29:12 2022 +0300 d2d1: Implement ID2D1EffectContext_IsShaderLoaded(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index eceb6234193..ff808475a78 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -195,6 +195,9 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); + if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + return S_OK; + if (FAILED(hr = ID3D11Device1_CreateVertexShader(effect_context->device_context->d3d_device, buffer, buffer_size, NULL, &vertex_shader))) { @@ -231,7 +234,16 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) { - FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + size_t i; + + TRACE("iface %p, shader_id %s.\n", iface, debugstr_guid(shader_id)); + + for (i = 0; i < effect_context->shader_count; ++i) + { + if (IsEqualGUID(shader_id, &effect_context->shaders[i].id)) + return TRUE; + } return FALSE; }

1 0

Nikolay Sivov : d2d1/effect: Store shader id itself, not a pointer to it.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: ecf6c84c297cccf1610f9df374aef561d4a34dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf6c84c297cccf1610f9df3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 25 10:29:11 2022 +0300 d2d1/effect: Store shader id itself, not a pointer to it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/effect.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9564f19a3cf..8edfa030ee1 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -582,7 +582,7 @@ void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDev struct d2d_shader { - const GUID *id; + GUID id; IUnknown *shader; }; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index b87ae6bb77d..eceb6234193 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -214,7 +214,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect effect_context->shader_count++; shader = &effect_context->shaders[effect_context->shader_count - 1]; - shader->id = shader_id; + shader->id = *shader_id; shader->shader = (IUnknown *)vertex_shader; return S_OK;

1 0

Ziqing Hui : d2d1/tests: Add tests for effect context.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 7f98e1417a224dc3ebc6562a623bbafe140df650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f98e1417a224dc3ebc6562a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 25 10:29:10 2022 +0300 d2d1/tests: Add tests for effect context. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9c2bc1cdb99..d5adb0c749c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -31,6 +31,8 @@ #include "wine/heap.h" DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); +DEFINE_GUID(GUID_TestVertexShader, 0x5bcdcfae,0x1e92,0x4dc1,0x94,0xfa,0x3b,0x01,0xca,0x54,0x59,0x20); +DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf,0x15,0x29,0x7f,0x01); static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ @@ -86,6 +88,39 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const DWORD test_vs[] = +{ +#if 0 + void main(float4 pos : Position, out float4 output : SV_Position) + { + output = pos; + } +#endif + 0x43425844, 0xa84b398b, 0xc4047d32, 0xc19c67bb, 0x4644285e, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x69736f50, 0x6e6f6974, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, +}; + +static const DWORD test_ps[] = +{ +#if 0 + float4 main() : SV_Target + { + return float4(0.1, 0.2, 0.3, 0.4); + } +#endif + 0x43425844, 0xf34300ae, 0x22fc6d56, 0x5cca66fa, 0x86ae3266, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3dcccccd, + 0x3e4ccccd, 0x3e99999a, 0x3ecccccd, 0x0100003e, +}; + static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); @@ -10559,6 +10594,84 @@ static void test_effect_register(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_context(BOOL d3d11) +{ + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Effect *effect = NULL; + ID2D1Factory1 *factory; + BOOL loaded; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + + /* Test shader loading */ + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); + ok(!loaded, "Shader is loaded.\n"); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + ok(!loaded, "Shader is loaded.\n"); + + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); + ok(loaded, "Shader is not loaded.\n"); + + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1EffectContext_LoadPixelShader(effect_context, + &GUID_TestPixelShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadPixelShader(effect_context, + &GUID_TestPixelShader, (const BYTE *)test_ps, sizeof(test_ps)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + ok(loaded, "Shader is not loaded.\n"); + +done: + if (effect) + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11344,6 +11457,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect_register); + queue_test(test_effect_context); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022