September 2021 - Wine-commits

Connor McAdams : user32/tests: Fix existing winevents in test_defwinproc() message sequences.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 86198569f6b5c9f3a4d4a75488ea179abc4f6011 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86198569f6b5c9f3a4d4a754… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:21 2021 -0400 user32/tests: Fix existing winevents in test_defwinproc() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0f683e333a8..f968ea4c2b7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15973,8 +15973,8 @@ static void test_paintingloop(void) static const struct message NCRBUTTONDOWNSeq[] = { - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, { WM_CONTEXTMENU, sent, /*hwnd*/0, -1 }, { 0 }

1 0

Connor McAdams : user32/tests: Add missing winevents to test_defwinproc() message sequences.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 51bf6cc0fd1566d5570194c725609f22b1d95d94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51bf6cc0fd1566d5570194c7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:22 2021 -0400 user32/tests: Add missing winevents to test_defwinproc() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f968ea4c2b7..f81c1bf483c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16005,17 +16005,20 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|optional }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|optional }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|optional }, { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam, TRUE }, { WM_NCACTIVATE, sent|wparam, TRUE }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, TRUE }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -16026,6 +16029,9 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ACTIVATE, sent|wparam, TRUE }, { WM_SYNCPAINT, sent|optional }, { WM_PAINT, sent }, @@ -16043,12 +16049,15 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCCALCSIZE, sent|optional }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win7. */ { WM_MOVE, sent|optional }, { WM_SIZE, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win7. */ { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win8+. */ { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent }, @@ -16058,7 +16067,11 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, /* Note this WM_ACTIVATE messages even if the window is already active */ { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, @@ -18658,6 +18671,11 @@ START_TEST(msg) test_nullCallback(); test_dbcs_wm_char(); test_unicode_wm_char(); + test_defwinproc(); + test_desktop_winproc(); + test_clipboard_viewers(); + test_keyflags(); + test_hotkey(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18668,11 +18686,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_defwinproc(); - test_desktop_winproc(); - test_clipboard_viewers(); - test_keyflags(); - test_hotkey(); test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty();

1 0

Connor McAdams : user32/tests: Add message to fix occasional failure in test_dialog_messages().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: e44e7673b9b5df256cad82c328fce0501fc26b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44e7673b9b5df256cad82c3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:23 2021 -0400 user32/tests: Add message to fix occasional failure in test_dialog_messages(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f81c1bf483c..66e6069da54 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14178,6 +14178,9 @@ static const struct message WmCreateDialogParamSeq_3[] = { { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|parent|optional, 0 }, + { WM_MOVE, sent|parent|optional }, + { WM_SIZE, sent|parent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent }, @@ -14211,6 +14214,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|parent|optional, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent },

1 0

Nikolay Sivov : d3d10/effect: Validate shared object types against the pool.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 3d1e7b0ed8845aa4d349edcdb7aea1a93c0d00cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d1e7b0ed8845aa4d349edcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:11 2021 +0300 d3d10/effect: Validate shared object types against the pool. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 81 +++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d10/tests/effect.c | 34 ++++++++++++------- 3 files changed, 99 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 21530b3d30c..7f64e811e9f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -270,7 +270,7 @@ struct d3d10_effect DWORD variable_count; DWORD local_variable_count; DWORD sharedbuffers_count; - DWORD sharedobjects_count; + DWORD shared_object_count; DWORD technique_count; DWORD index_offset; DWORD texture_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71bc8161c76..1913d621ecc 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -50,6 +50,7 @@ static inline struct d3d10_effect *impl_from_ID3D10EffectPool(ID3D10EffectPool * } static const struct ID3D10EffectVtbl d3d10_effect_pool_effect_vtbl; +static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v); static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; @@ -2096,8 +2097,8 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) return S_OK; } -static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, - const char **ptr, struct d3d10_effect_variable *v) +static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, + const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { unsigned int i; HRESULT hr; @@ -2119,6 +2120,9 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &v->explicit_bind_point); TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); + /* Shared variable description contains only type information. */ + if (shared_type_desc) return S_OK; + switch (v->type->basetype) { case D3D10_SVT_TEXTURE: @@ -2534,6 +2538,50 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context heap_free(t); } +static BOOL d3d10_effect_types_match(const struct d3d10_effect_type *t1, + const struct d3d10_effect_type *t2) +{ + unsigned int i; + + if (strcmp(t1->name, t2->name)) return FALSE; + if (t1->basetype != t2->basetype) return FALSE; + if (t1->type_class != t2->type_class) return FALSE; + if (t1->element_count != t2->element_count) return FALSE; + if (t1->element_count) return d3d10_effect_types_match(t1->elementtype, t2->elementtype); + if (t1->member_count != t2->member_count) return FALSE; + if (t1->column_count != t2->column_count) return FALSE; + if (t1->row_count != t2->row_count) return FALSE; + + for (i = 0; i < t1->member_count; ++i) + { + if (strcmp(t1->members[i].name, t2->members[i].name)) return FALSE; + if (t1->members[i].buffer_offset != t2->members[i].buffer_offset) return FALSE; + if (!d3d10_effect_types_match(t1->members[i].type, t2->members[i].type)) return FALSE; + } + + return TRUE; +} + +static HRESULT d3d10_effect_validate_shared_variable(const struct d3d10_effect *effect, + const struct d3d10_effect_variable *v) +{ + ID3D10EffectVariable *sv = effect->pool->lpVtbl->GetVariableByName(effect->pool, v->name); + + if (!sv->lpVtbl->IsValid(sv)) + { + WARN("Variable %s wasn't found in the pool.\n", debugstr_a(v->name)); + return E_INVALIDARG; + } + + if (!d3d10_effect_types_match(impl_from_ID3D10EffectVariable(sv)->type, v->type)) + { + WARN("Variable %s type does not match pool type.\n", debugstr_a(v->name)); + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr; @@ -2596,10 +2644,27 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d v->ID3D10EffectVariable_iface.lpVtbl = &d3d10_effect_variable_vtbl; v->buffer = &null_local_buffer; - if (FAILED(hr = parse_fx10_local_variable(data, data_size, &ptr, v))) + if (FAILED(hr = parse_fx10_object_variable(data, data_size, &ptr, FALSE, v))) return hr; } + for (i = 0; i < e->shared_object_count; ++i) + { + struct d3d10_effect_variable o = { 0 }; + + o.effect = e; + + if (FAILED(hr = parse_fx10_object_variable(data, data_size, &ptr, TRUE, &o))) + { + d3d10_effect_variable_destroy(&o); + return hr; + } + + hr = d3d10_effect_validate_shared_variable(e, &o); + d3d10_effect_variable_destroy(&o); + if (FAILED(hr)) return hr; + } + for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; @@ -2644,8 +2709,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &unused); TRACE("Pool variable count: %u\n", unused); - read_dword(&ptr, &e->sharedobjects_count); - TRACE("Pool objects count: %u\n", e->sharedobjects_count); + read_dword(&ptr, &e->shared_object_count); + TRACE("Pool objects count: %u\n", e->shared_object_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -2683,6 +2748,12 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->anonymous_shader_count); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); + if (!e->pool && e->shared_object_count) + { + WARN("Effect requires a pool to load.\n"); + return E_FAIL; + } + return parse_fx10_body(e, ptr, data_size - (ptr - data)); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9daf3faf8d0..5e54925abb2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6335,11 +6335,15 @@ cbuffer l_cb2 float f3; }; +shared BlendState s_blendstate; +shared Texture s_texture; +shared PixelShader ps; + technique10 tech_child { pass P0 { - SetPixelShader(NULL); + SetPixelShader(ps); SetVertexShader(NULL); SetGeometryShader(NULL); } @@ -6347,19 +6351,25 @@ technique10 tech_child #endif static DWORD fx_test_pool_child[] = { - 0x43425844, 0x5addae59, 0x62b6f327, 0x0ca7b6a5, 0x61338a81, 0x00000001, 0x00000198, 0x00000001, - 0x00000024, 0x30315846, 0x0000016c, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x22800afa, 0xe318151b, 0xcb3e7d52, 0x186ecbe3, 0x00000001, 0x00000249, 0x00000001, + 0x00000024, 0x30315846, 0x0000021d, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x000000f1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x62635f6c, 0x6f6c6600, 0x09007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, 0x04000000, 0x09000000, - 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x65740033, 0x635f6863, 0x646c6968, - 0x00305000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, - 0x00000002, 0x00000000, 0x00000004, 0x00000010, 0x00000000, 0x00000001, 0xffffffff, 0x00000000, - 0x0000002b, 0x0000000f, 0x0000002e, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000035, - 0x00000010, 0x00000000, 0x00000001, 0xffffffff, 0x00000000, 0x0000003b, 0x0000000f, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003e, 0x00000001, 0x00000000, 0x00000049, - 0x00000003, 0x00000000, 0x00000007, 0x00000000, 0x00000001, 0x0000004c, 0x00000006, 0x00000000, - 0x00000001, 0x00000058, 0x00000008, 0x00000000, 0x00000001, 0x00000064, + 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x6c420033, 0x53646e65, 0x65746174, + 0x00003e00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x625f7300, + 0x646e656c, 0x74617473, 0x65740065, 0x72757478, 0x00720065, 0x00020000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00090000, 0x5f730000, 0x74786574, 0x00657275, 0x65786950, 0x6168536c, + 0x00726564, 0x000000a0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, + 0x74007370, 0x5f686365, 0x6c696863, 0x30500064, 0x00000100, 0x00000200, 0x00000000, 0x00000100, + 0x00000200, 0x00000000, 0x00000400, 0x00001000, 0x00000000, 0x00000100, 0xffffff00, 0x000000ff, + 0x00002b00, 0x00000f00, 0x00002e00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003500, + 0x00001000, 0x00000000, 0x00000100, 0xffffff00, 0x000000ff, 0x00003b00, 0x00000f00, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00006500, 0x00004900, 0x00000000, 0xffffff00, + 0x000096ff, 0x00007a00, 0x00000000, 0xffffff00, 0x0000c8ff, 0x0000ac00, 0x00000000, 0xffffff00, + 0x0000cbff, 0x00000100, 0x00000000, 0x0000d600, 0x00000300, 0x00000000, 0x00000700, 0x00000000, + 0x00000200, 0x0000c800, 0x00000600, 0x00000000, 0x00000100, 0x0000d900, 0x00000800, 0x00000000, + 0x00000100, 0x0000e500, 0x00000000, }; static void test_effect_pool(void)

1 0

Nikolay Sivov : d3d10/effect: Validate shared constant buffer types against the pool.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 099aa57f23fd20ffc499ebc32e49559bab805814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099aa57f23fd20ffc499ebc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:12 2021 +0300 d3d10/effect: Validate shared constant buffer types against the pool. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 101 ++++++++++++++++++++++++++++++--------------- dlls/d3d10/tests/effect.c | 42 +++++++++++-------- 3 files changed, 94 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=099aa57f23fd20ffc499…

1 0

Nikolay Sivov : d3d10/effect: Implement IsOptimized().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 2cc6b3092de95eb25e856932f6f7d105906101a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc6b3092de95eb25e856932… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:13 2021 +0300 d3d10/effect: Implement IsOptimized(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 6 ++++++ dlls/d3d10/effect.c | 11 +++++++++-- dlls/d3d10/tests/effect.c | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 3c3c6fa7f58..e7ecfb73a64 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -256,6 +256,11 @@ struct d3d10_effect_anonymous_shader struct d3d10_effect_type type; }; +enum d3d10_effect_flags +{ + D3D10_EFFECT_OPTIMIZED = 0x1, +}; + /* ID3D10Effect */ struct d3d10_effect { @@ -282,6 +287,7 @@ struct d3d10_effect DWORD depthstencilview_count; DWORD used_shader_count; DWORD anonymous_shader_count; + DWORD flags; DWORD used_shader_current; DWORD anonymous_shader_current; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8246f288369..8aed914c909 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3531,6 +3531,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) FIXME("iface %p semi-stub!\n", iface); + if (effect->flags & D3D10_EFFECT_OPTIMIZED) + return S_OK; + for (i = 0; i < effect->used_shader_count; ++i) { v = effect->used_shaders[i]; @@ -3561,14 +3564,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) effect->techniques[i].name = NULL; } + effect->flags |= D3D10_EFFECT_OPTIMIZED; + return S_OK; } static BOOL STDMETHODCALLTYPE d3d10_effect_IsOptimized(ID3D10Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); - return FALSE; + TRACE("iface %p.\n", iface); + + return !!(effect->flags & D3D10_EFFECT_OPTIMIZED); } const struct ID3D10EffectVtbl d3d10_effect_vtbl = diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 29773fc4582..9f377e80b17 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6017,6 +6017,7 @@ static void test_effect_optimize(void) ID3D10Device *device; ULONG refcount; HRESULT hr; + BOOL ret; if (!(device = create_device())) { @@ -6051,9 +6052,15 @@ static void test_effect_optimize(void) ok(!!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); ok(!!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); + ret = effect->lpVtbl->IsOptimized(effect); + ok(!ret, "Unexpected return value.\n"); + hr = effect->lpVtbl->Optimize(effect); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ret = effect->lpVtbl->IsOptimized(effect); + ok(ret, "Unexpected return value.\n"); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); @@ -6081,6 +6088,10 @@ static void test_effect_optimize(void) tech = effect->lpVtbl->GetTechniqueByName(effect, "Render"); ok(!tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n"); + /* Already optimized */ + hr = effect->lpVtbl->Optimize(effect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Handle D3D10_SVT_UINT when reading float constants.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: f96499af6a63d6493a060de8c41753437ede845c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96499af6a63d6493a060de8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:14 2021 +0300 d3d10/effect: Handle D3D10_SVT_UINT when reading float constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8aed914c909..668efcda666 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1503,6 +1503,10 @@ static BOOL read_float_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, floa out_data[idx] = (INT)value; return TRUE; + case D3D10_SVT_UINT: + out_data[idx] = value; + return TRUE; + default: FIXME("Unhandled in_type %#x.\n", in_type); return FALSE;

1 0

Nikolay Sivov : d3d10/tests: Regenerate state group test effect with newer compiler.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 5227259043a8168b533107875f6f46911dc68279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5227259043a8168b53310787… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:15 2021 +0300 d3d10/tests: Regenerate state group test effect with newer compiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 186 ++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5227259043a8168b5331…

1 0

Gerald Pfeifer : winebus.sys: Fix non-Linux builds.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 0c81dc223d2a63eae38fe54b6cbbf6422265e7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c81dc223d2a63eae38fe54b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 27 11:32:47 2021 +0200 winebus.sys: Fix non-Linux builds. commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. moved an existing use of ABS_VOLUME that was guarded by #ifdef HAS_PROPER_INPUT_HEADER outside that guard, breaking the build on non-Linux platforms. Address this by putting appropriate guards in place. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 48 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 88db78360e2..fce3a7672d9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -110,11 +110,23 @@ struct base_device int device_fd; }; +static inline struct base_device *impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(iface, struct base_device, unix_device); +} + struct hidraw_device { struct base_device base; }; +static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); +} + +#ifdef HAS_PROPER_INPUT_HEADER + #define HID_REL_MAX (REL_MISC+1) #define HID_ABS_MAX (ABS_VOLUME+1) @@ -130,21 +142,13 @@ struct lnxev_device int haptic_effect_id; }; -static inline struct base_device *impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(iface, struct base_device, unix_device); -} - -static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); -} - static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base); } +#endif /* HAS_PROPER_INPUT_HEADER */ + #define MAX_DEVICES 128 static int close_fds[MAX_DEVICES]; static struct pollfd poll_fds[MAX_DEVICES]; @@ -201,6 +205,18 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } +static struct base_device *find_device_from_udev(struct udev_device *dev) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (impl->udev_device == dev) return impl; + + return NULL; +} + +#ifdef HAS_PROPER_INPUT_HEADER + static const char *get_device_syspath(struct udev_device *dev) { struct udev_device *parent; @@ -224,18 +240,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static struct base_device *find_device_from_udev(struct udev_device *dev) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (impl->udev_device == dev) return impl; - - return NULL; -} - -#ifdef HAS_PROPER_INPUT_HEADER - static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/

1 0

Rémi Bernon : winebus.sys: Move hidraw_device code around.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 55e978168e7f3d6ac48046002ec92bf631ddaf58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e978168e7f3d6ac4804600… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 11:32:48 2021 +0200 winebus.sys: Move hidraw_device code around. To keep lnxev_device functions and related helpers all together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 375 ++++++++++++++++++++++---------------------- 1 file changed, 186 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55e978168e7f3d6ac480…

1 0