July 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1/effect: Support parsing int32 property values.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 5f1f52cff265dd3154a01a58018094ec781b6cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f1f52cff265dd3154a01a58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 15:54:42 2022 +0300 d2d1/effect: Support parsing int32 property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 3 ++- dlls/d2d1/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 154b3c35a1b..2a980dd33a6 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -267,7 +267,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * 0, /* D2D1_PROPERTY_TYPE_STRING */ sizeof(BOOL), /* D2D1_PROPERTY_TYPE_BOOL */ sizeof(UINT32), /* D2D1_PROPERTY_TYPE_UINT32 */ - sizeof(INT32), /* D2D1_PROPERTY_TYPE_IN32 */ + sizeof(INT32), /* D2D1_PROPERTY_TYPE_INT32 */ sizeof(float), /* D2D1_PROPERTY_TYPE_FLOAT */ 2 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR2 */ 3 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR3 */ @@ -345,6 +345,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * switch (p->type) { case D2D1_PROPERTY_TYPE_UINT32: + case D2D1_PROPERTY_TYPE_INT32: case D2D1_PROPERTY_TYPE_ENUM: _uint32 = wcstoul(value, NULL, 10); src = &_uint32; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d796d738077..aa2e98aa22a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -50,6 +50,14 @@ L"<?xml version='1.0'?> \ <Property name='Max' type='uint32' value='100'/> \ <Property name='Default' type='uint32' value='10'/> \ </Property> \ + <Property name='Int32Prop' type='int32' value='-2'> \ + <Property name='DisplayName' type='string' value='Int32 prop'/> \ + <Property name='Default' type='int32' value='10'/> \ + </Property> \ + <Property name='UInt32Prop' type='uint32' value='-3'> \ + <Property name='DisplayName' type='string' value='UInt32 prop'/> \ + <Property name='Default' type='uint32' value='10'/> \ + </Property> \ <Property name='Bool' type='bool'> \ <Property name='DisplayName' type='string' value='Bool property'/> \ <Property name='Default' type='bool' value='false'/> \ @@ -11042,6 +11050,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; + INT32 _int32; CLSID clsid; BOOL cached; HRESULT hr; @@ -11133,6 +11142,28 @@ static void test_effect_properties(BOOL d3d11) ID2D1Properties_Release(subproperties); + /* Int32 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Int32Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Int32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_INT32, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&_int32, sizeof(_int32)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(_int32 == -2, "Unexpected value %d.\n", _int32); + + /* UInt32 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"UInt32Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"UInt32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_UINT32, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == -3, "Unexpected value %u.\n", integer); + /* Vector2 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Vec2Prop"); hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer));

1 0

Nikolay Sivov : d2d1/effect: Support parsing matrix poperty values.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 5e714c64039ff2c983dd880b3b71aa1c86f6e162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e714c64039ff2c983dd880b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 17:45:45 2022 +0300 d2d1/effect: Support parsing matrix poperty values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 37 +++++++++++++++++++------ dlls/d2d1/tests/d2d1.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 2a980dd33a6..640aab15817 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -230,20 +230,34 @@ static const struct d2d_effect_info builtin_effects[] = }; /* Same syntax is used for value and default values. */ -static HRESULT d2d_effect_parse_vector_value(D2D1_PROPERTY_TYPE type, const WCHAR *value, +static HRESULT d2d_effect_parse_float_array(D2D1_PROPERTY_TYPE type, const WCHAR *value, float *vec) { unsigned int i, num_components; WCHAR *end_ptr; - assert(type == D2D1_PROPERTY_TYPE_VECTOR2 || type == D2D1_PROPERTY_TYPE_VECTOR3 - || type == D2D1_PROPERTY_TYPE_VECTOR4); + /* Type values are sequential. */ + switch (type) + { + case D2D1_PROPERTY_TYPE_VECTOR2: + case D2D1_PROPERTY_TYPE_VECTOR3: + case D2D1_PROPERTY_TYPE_VECTOR4: + num_components = (type - D2D1_PROPERTY_TYPE_VECTOR2) + 2; + break; + case D2D1_PROPERTY_TYPE_MATRIX_3X2: + num_components = 6; + break; + case D2D1_PROPERTY_TYPE_MATRIX_4X3: + case D2D1_PROPERTY_TYPE_MATRIX_4X4: + case D2D1_PROPERTY_TYPE_MATRIX_5X4: + num_components = (type - D2D1_PROPERTY_TYPE_MATRIX_4X3) * 4 + 12; + break; + default: + return E_UNEXPECTED; + } if (*(value++) != '(') return E_INVALIDARG; - /* Type values are sequential. */ - num_components = (type - D2D1_PROPERTY_TYPE_VECTOR2) + 2; - for (i = 0; i < num_components; ++i) { vec[i] = wcstof(value, &end_ptr); @@ -332,7 +346,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * { void *src = NULL; UINT32 _uint32; - float _vec[4]; + float _vec[20]; CLSID _clsid; BOOL _bool; @@ -363,9 +377,14 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * case D2D1_PROPERTY_TYPE_VECTOR2: case D2D1_PROPERTY_TYPE_VECTOR3: case D2D1_PROPERTY_TYPE_VECTOR4: - if (FAILED(hr = d2d_effect_parse_vector_value(p->type, value, _vec))) + case D2D1_PROPERTY_TYPE_MATRIX_3X2: + case D2D1_PROPERTY_TYPE_MATRIX_4X3: + case D2D1_PROPERTY_TYPE_MATRIX_4X4: + case D2D1_PROPERTY_TYPE_MATRIX_5X4: + if (FAILED(hr = d2d_effect_parse_float_array(p->type, value, _vec))) { - WARN("Failed to parse vector value %s.\n", wine_dbgstr_w(value)); + WARN("Failed to parse float array %s for type %u.\n", + wine_dbgstr_w(value), p->type); return hr; } src = _vec; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index aa2e98aa22a..334e9f1adea 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -74,6 +74,30 @@ L"<?xml version='1.0'?> \ <Property name='DisplayName' type='string' value='Vec4 prop'/> \ <Property name='Default' type='vector4' value='(0.8,0.9,1.0,1.1)'/> \ </Property> \ + <Property name='Mat3x2Prop' type='matrix3x2' \ + value='(1.0,2.0,3.0,4.0,5.0,6.0)'> \ + <Property name='DisplayName' type='string' value='Mat3x2 prop'/> \ + <Property name='Default' type='matrix3x2' \ + value='(0.1,0.2,0.3,0.4,0.5,0.6)'/> \ + </Property> \ + <Property name='Mat4x3Prop' type='matrix4x3' \ + value='(1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0,11.0,12)'> \ + <Property name='DisplayName' type='string' value='Mat4x3 prop'/> \ + <Property name='Default' type='matrix4x3' \ + value='(0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0,1.1,1.2)'/> \ + </Property> \ + <Property name='Mat4x4Prop' type='matrix4x4' \ + value='(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)'> \ + <Property name='DisplayName' type='string' value='Mat4x4 prop'/> \ + <Property name='Default' type='matrix4x4' \ + value='(16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1)'/> \ + </Property> \ + <Property name='Mat5x4Prop' type='matrix5x4' \ + value='(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)'> \ + <Property name='DisplayName' type='string' value='Mat5x4 prop'/> \ + <Property name='Default' type='matrix5x4' \ + value='(20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1)'/>\ + </Property> \ </Effect> \ "; @@ -11050,6 +11074,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; + float mat[20]; INT32 _int32; CLSID clsid; BOOL cached; @@ -11199,6 +11224,55 @@ static void test_effect_properties(BOOL d3d11) ok(vec4[0] == 8.0f && vec4[1] == 9.0f && vec4[2] == 10.0f && vec4[3] == 11.0f, "Unexpected vector (%.8e,%.8e,%.8e,%.8e).\n", vec4[0], vec4[1], vec4[2], vec4[3]); + /* Matrix3x2 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Mat3x2Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Mat3x2Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_3X2, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_3X2, (BYTE *)mat, 6 * sizeof(float)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(mat[0] == 1.0f && mat[1] == 2.0f && mat[2] == 3.0f && mat[3] == 4.0f && mat[4] == 5.0f && mat[5] == 6.0f, + "Unexpected matrix (%.8e,%.8e,%.8e,%.8e,%.8e,%.8e).\n", + mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + + /* Matrix4x3 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Mat4x3Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Mat4x3Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_4X3, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_4X3, (BYTE *)mat, 12 * sizeof(float)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + for (i = 0; i < 12; ++i) + ok(mat[i] == 1.0f + i, "Unexpected matrix element %u.\n", i); + + /* Matrix4x4 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Mat4x4Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Mat4x4Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_4X4, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_4X4, (BYTE *)mat, 16 * sizeof(float)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + for (i = 0; i < 16; ++i) + ok(mat[i] == 1.0f + i, "Unexpected matrix element %u.\n", i); + + /* Matrix5x4 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Mat5x4Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Mat5x4Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_MATRIX_5X4, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_MATRIX_5X4, (BYTE *)mat, 20 * sizeof(float)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + for (i = 0; i < 20; ++i) + ok(mat[i] == 1.0f + i, "Unexpected matrix element %u.\n", i); + ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect);

1 0

Paul Gofman : msvcp140_2: Add stub dll.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: f3c36f725629cd1f7d19000193b391768aa81869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c36f725629cd1f7d190001… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 30 19:07:45 2022 -0500 msvcp140_2: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/msvcp140_2/Makefile.in | 1 + dlls/msvcp140_2/msvcp140_2.spec | 44 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/configure b/configure index 50c23800f62..e563a2f9502 100755 --- a/configure +++ b/configure @@ -1227,6 +1227,7 @@ enable_msvcp120 enable_msvcp120_app enable_msvcp140 enable_msvcp140_1 +enable_msvcp140_2 enable_msvcp140_atomic_wait enable_msvcp60 enable_msvcp70 @@ -21657,6 +21658,7 @@ wine_fn_config_makefile dlls/msvcp140 enable_msvcp140 wine_fn_config_makefile dlls/msvcp140/tests enable_tests wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests +wine_fn_config_makefile dlls/msvcp140_2 enable_msvcp140_2 wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait wine_fn_config_makefile dlls/msvcp140_atomic_wait/tests enable_tests wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 diff --git a/configure.ac b/configure.ac index 9ad1b19164c..d5791bab7b1 100644 --- a/configure.ac +++ b/configure.ac @@ -2825,6 +2825,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140) WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_2) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp60) diff --git a/dlls/msvcp140_2/Makefile.in b/dlls/msvcp140_2/Makefile.in new file mode 100644 index 00000000000..5b4865db844 --- /dev/null +++ b/dlls/msvcp140_2/Makefile.in @@ -0,0 +1 @@ +MODULE = msvcp140_2.dll diff --git a/dlls/msvcp140_2/msvcp140_2.spec b/dlls/msvcp140_2/msvcp140_2.spec new file mode 100644 index 00000000000..c59da9aba9c --- /dev/null +++ b/dlls/msvcp140_2/msvcp140_2.spec @@ -0,0 +1,44 @@ +@ stub __std_smf_assoc_laguerre +@ stub __std_smf_assoc_laguerref +@ stub __std_smf_assoc_legendre +@ stub __std_smf_assoc_legendref +@ stub __std_smf_beta +@ stub __std_smf_betaf +@ stub __std_smf_comp_ellint_1 +@ stub __std_smf_comp_ellint_1f +@ stub __std_smf_comp_ellint_2 +@ stub __std_smf_comp_ellint_2f +@ stub __std_smf_comp_ellint_3 +@ stub __std_smf_comp_ellint_3f +@ stub __std_smf_cyl_bessel_i +@ stub __std_smf_cyl_bessel_if +@ stub __std_smf_cyl_bessel_j +@ stub __std_smf_cyl_bessel_jf +@ stub __std_smf_cyl_bessel_k +@ stub __std_smf_cyl_bessel_kf +@ stub __std_smf_cyl_neumann +@ stub __std_smf_cyl_neumannf +@ stub __std_smf_ellint_1 +@ stub __std_smf_ellint_1f +@ stub __std_smf_ellint_2 +@ stub __std_smf_ellint_2f +@ stub __std_smf_ellint_3 +@ stub __std_smf_ellint_3f +@ stub __std_smf_expint +@ stub __std_smf_expintf +@ stub __std_smf_hermite +@ stub __std_smf_hermitef +@ stub __std_smf_hypot3 +@ stub __std_smf_hypot3f +@ stub __std_smf_laguerre +@ stub __std_smf_laguerref +@ stub __std_smf_legendre +@ stub __std_smf_legendref +@ stub __std_smf_riemann_zeta +@ stub __std_smf_riemann_zetaf +@ stub __std_smf_sph_bessel +@ stub __std_smf_sph_besself +@ stub __std_smf_sph_legendre +@ stub __std_smf_sph_legendref +@ stub __std_smf_sph_neumann +@ stub __std_smf_sph_neumannf

1 0

Jacek Caban : win32u: Move NtUserShowScrollBar implementation from user32.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: b4ba6de6e135ca5003926b424c616a9872bb5377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4ba6de6e135ca5003926b42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 13:22:35 2022 +0200 win32u: Move NtUserShowScrollBar implementation from user32. --- dlls/user32/listbox.c | 2 +- dlls/user32/mdi.c | 4 +-- dlls/user32/scroll.c | 25 -------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/scroll.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ include/ntuser.h | 1 + 11 files changed, 95 insertions(+), 30 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 1e7231b4c05..b8b683e6e3c 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -395,7 +395,7 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) } else { - ShowScrollBar( descr->self, SB_HORZ, FALSE ); + NtUserShowScrollBar( descr->self, SB_HORZ, FALSE ); } } } diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 11c17a6dbd8..fbac63dd881 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1158,7 +1158,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_MDITILE: ci->mdiFlags |= MDIF_NEEDUPDATE; - ShowScrollBar( hwnd, SB_BOTH, FALSE ); + NtUserShowScrollBar( hwnd, SB_BOTH, FALSE ); MDITile( hwnd, ci, wParam ); ci->mdiFlags &= ~MDIF_NEEDUPDATE; return 0; @@ -1701,7 +1701,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) if (style & WS_MAXIMIZE) { HeapFree( GetProcessHeap(), 0, list ); - ShowScrollBar( hwnd, SB_BOTH, FALSE ); + NtUserShowScrollBar( hwnd, SB_BOTH, FALSE ); return; } if (style & WS_VISIBLE) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index b6f15b4a295..d7972e2c6e8 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2003,31 +2003,6 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV } -/************************************************************************* - * ShowScrollBar (USER32.@) - * - * Shows or hides the scroll bar. - * - * PARAMS - * hwnd [I] Handle of window with scrollbar(s) - * nBar [I] One of SB_HORZ, SB_VERT, or SB_CTL - * fShow [I] TRUE = show, FALSE = hide - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DECLSPEC_HOTPATCH ShowScrollBar(HWND hwnd, INT nBar, BOOL fShow) -{ - if ( !hwnd ) - return FALSE; - - SCROLL_ShowScrollBar( hwnd, nBar, (nBar == SB_VERT) ? 0 : fShow, - (nBar == SB_HORZ) ? 0 : fShow ); - return TRUE; -} - - /************************************************************************* * EnableScrollBar (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e1cc18f7287..ce8365b1336 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -739,7 +739,7 @@ @ stdcall ShowCaret(long) NtUserShowCaret @ stdcall -import ShowCursor(long) NtUserShowCursor @ stdcall ShowOwnedPopups(long long) -@ stdcall ShowScrollBar(long long long) +@ stdcall ShowScrollBar(long long long) NtUserShowScrollBar @ stub ShowStartGlass @ stdcall ShowWindow(long long) NtUserShowWindow @ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 13b329b0233..153f5f45d9f 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -45,6 +45,7 @@ C_SRCS = \ printdrv.c \ rawinput.c \ region.c \ + scroll.c \ spy.c \ syscall.c \ sysparams.c \ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 9d95d3cf94a..d843716e4c0 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1236,6 +1236,7 @@ static struct unix_funcs unix_funcs = NtUserSetWindowWord, NtUserShowCaret, NtUserShowCursor, + NtUserShowScrollBar, NtUserShowWindow, NtUserShowWindowAsync, NtUserSystemParametersInfo, diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c new file mode 100644 index 00000000000..380ce5fc75b --- /dev/null +++ b/dlls/win32u/scroll.c @@ -0,0 +1,80 @@ +/* + * Scrollbar control + * + * Copyright 1993 Martin Ayotte + * Copyright 1994, 1996 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "win32u_private.h" +#include "ntuser_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scroll); + + +static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert ) +{ + ULONG old_style, set_bits = 0, clear_bits = 0; + + TRACE( "hwnd=%p bar=%d horz=%d, vert=%d\n", hwnd, bar, show_horz, show_vert ); + + switch (bar) + { + case SB_CTL: + NtUserShowWindow( hwnd, show_horz ? SW_SHOW : SW_HIDE ); + return TRUE; + + case SB_BOTH: + case SB_HORZ: + if (show_horz) set_bits |= WS_HSCROLL; + else clear_bits |= WS_HSCROLL; + if (bar == SB_HORZ) break; + /* fall through */ + case SB_VERT: + if (show_vert) set_bits |= WS_VSCROLL; + else clear_bits |= WS_VSCROLL; + break; + + default: + return FALSE; /* Nothing to do! */ + } + + old_style = set_window_style( hwnd, set_bits, clear_bits ); + if ((old_style & clear_bits) != 0 || (old_style & set_bits) != set_bits) + { + /* frame has been changed, let the window redraw itself */ + NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); + return TRUE; + } + return FALSE; /* no frame changes */ +} + +/************************************************************************* + * NtUserShowScrollBar (win32u.@) + */ +BOOL WINAPI NtUserShowScrollBar( HWND hwnd, INT bar, BOOL show ) +{ + if (!hwnd) return FALSE; + + show_scroll_bar( hwnd, bar, bar == SB_VERT ? 0 : show, bar == SB_HORZ ? 0 : show ); + return TRUE; +} diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 68201f763ab..428e8aadf1c 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1259,7 +1259,7 @@ @ stdcall -syscall NtUserSetWindowsHookEx(ptr ptr long long ptr long) @ stdcall NtUserShowCaret(long) @ stdcall NtUserShowCursor(long) -@ stub NtUserShowScrollBar +@ stdcall NtUserShowScrollBar(long long long) @ stub NtUserShowSystemCursor @ stdcall NtUserShowWindow(long long) @ stdcall NtUserShowWindowAsync(long long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d3f359fd4ee..00bc3e16828 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -310,6 +310,7 @@ struct unix_funcs WORD (WINAPI *pNtUserSetWindowWord)( HWND hwnd, INT offset, WORD newval ); BOOL (WINAPI *pNtUserShowCaret)( HWND hwnd ); INT (WINAPI *pNtUserShowCursor)( BOOL show ); + BOOL (WINAPI *pNtUserShowScrollBar)( HWND hwnd, INT bar, BOOL show ); BOOL (WINAPI *pNtUserShowWindow)( HWND hwnd, INT cmd ); BOOL (WINAPI *pNtUserShowWindowAsync)( HWND hwnd, INT cmd ); BOOL (WINAPI *pNtUserSystemParametersInfo)( UINT action, UINT val, PVOID ptr, UINT winini ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index b451e57e3b1..e7ab66cadcb 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1334,6 +1334,12 @@ INT WINAPI NtUserShowCursor( BOOL show ) return unix_funcs->pNtUserShowCursor( show ); } +BOOL WINAPI NtUserShowScrollBar( HWND hwnd, INT bar, BOOL show ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserShowScrollBar( hwnd, bar, show ); +} + BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index 3862eb55054..2f6b8863228 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -718,6 +718,7 @@ HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HM DWORD pid, DWORD tid, DWORD flags ); BOOL WINAPI NtUserShowCaret( HWND hwnd ); INT WINAPI NtUserShowCursor( BOOL show ); +BOOL WINAPI NtUserShowScrollBar( HWND hwnd, INT bar, BOOL show ); BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ); BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ); BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT winini );

1 0

Jacek Caban : win32u: Partially move ScrollBarWndProc implementation from user32.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 22cab055e41db442739fa22aaf7bfd3121d60c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=22cab055e41db442739fa22a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 20:52:31 2022 +0200 win32u: Partially move ScrollBarWndProc implementation from user32. --- dlls/user32/scroll.c | 4 +--- dlls/win32u/message.c | 14 ++++++++++++++ dlls/win32u/scroll.c | 15 +++++++++++++++ dlls/win32u/win32u_private.h | 4 ++++ include/ntuser.h | 1 + 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d7972e2c6e8..d9bc69895aa 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1513,10 +1513,8 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA break; case WM_ERASEBKGND: - return 1; - case WM_GETDLGCODE: - return DLGC_WANTARROWS; /* Windows returns this value */ + return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserScrollBarWndProc, !unicode ); case WM_PAINT: { diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0603a248f60..65f44783fe6 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2889,17 +2889,25 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { switch (type) { + case NtUserScrollBarWndProc: + return scroll_bar_window_proc( hwnd, msg, wparam, lparam, ansi ); + case NtUserPopupMenuWndProc: return popup_menu_window_proc( hwnd, msg, wparam, lparam ); + case NtUserDesktopWindowProc: return desktop_window_proc( hwnd, msg, wparam, lparam ); + case NtUserDefWindowProc: return default_window_proc( hwnd, msg, wparam, lparam, ansi ); + case NtUserCallWindowProc: return init_win_proc_params( (struct win_proc_params *)result_info, hwnd, msg, wparam, lparam, ansi ); + case NtUserSendMessage: return send_window_message( hwnd, msg, wparam, lparam, ansi ); + case NtUserSendMessageTimeout: { struct send_message_timeout_params *params = (void *)result_info; @@ -2908,18 +2916,24 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa params->timeout, &res, ansi ); return res; } + case NtUserSendNotifyMessage: return send_notify_message( hwnd, msg, wparam, lparam, ansi ); + case NtUserSendMessageCallback: return send_message_callback( hwnd, msg, wparam, lparam, (void *)result_info, ansi ); + case NtUserClipboardWindowProc: return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); + case NtUserSpyEnter: spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; + case NtUserSpyExit: spy_exit_message( ansi, hwnd, msg, (LPARAM)result_info, wparam, lparam ); return 0; + default: FIXME( "%p %x %lx %lx %p %x %x\n", hwnd, msg, wparam, lparam, result_info, type, ansi ); } diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 380ce5fc75b..ff60ec5c4ce 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -68,6 +68,21 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert return FALSE; /* no frame changes */ } +LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) +{ + switch (msg) + { + case WM_ERASEBKGND: + return 1; + + case WM_GETDLGCODE: + return DLGC_WANTARROWS; /* Windows returns this value */ + + default: + return default_window_proc( hwnd, msg, wparam, lparam, ansi ); + } +} + /************************************************************************* * NtUserShowScrollBar (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 00bc3e16828..90ca0e9b143 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -440,6 +440,10 @@ extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) DECLSPEC_HIDDEN; extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHORT *usage ) DECLSPEC_HIDDEN; +/* scroll.c */ +extern LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, + BOOL ansi ) DECLSPEC_HIDDEN; + /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; extern DWORD process_layout DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 2f6b8863228..08a49cbd123 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -211,6 +211,7 @@ struct render_synthesized_format_params /* NtUserMessageCall codes */ enum { + NtUserScrollBarWndProc = 0x029a, NtUserPopupMenuWndProc = 0x029c, NtUserDesktopWindowProc = 0x029d, NtUserDefWindowProc = 0x029e,

1 0

Piotr Caban : d3dx10: Add D3DX10CreateThreadPump stub.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 9c2f037b3f7e17cf7df642d7615fe0abc9209e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c2f037b3f7e17cf7df642d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 15:14:24 2022 +0200 d3dx10: Add D3DX10CreateThreadPump stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 123 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10core.h | 1 + 3 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index bb1cf30a217..7913f634c21 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -609,3 +609,126 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si return E_NOTIMPL; } + +struct thread_pump +{ + ID3DX10ThreadPump ID3DX10ThreadPump_iface; + LONG refcount; +}; + +static inline struct thread_pump *impl_from_ID3DX10ThreadPump(ID3DX10ThreadPump *iface) +{ + return CONTAINING_RECORD(iface, struct thread_pump, ID3DX10ThreadPump_iface); +} + +static HRESULT WINAPI thread_pump_QueryInterface(ID3DX10ThreadPump *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10ThreadPump) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3DX10ThreadPump_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI thread_pump_AddRef(ID3DX10ThreadPump *iface) +{ + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + ULONG refcount = InterlockedIncrement(&thread_pump->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI thread_pump_Release(ID3DX10ThreadPump *iface) +{ + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + ULONG refcount = InterlockedDecrement(&thread_pump->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + free(thread_pump); + + return refcount; +} + +static HRESULT WINAPI thread_pump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10DataLoader *loader, + ID3DX10DataProcessor *processor, HRESULT *result, void **object) +{ + FIXME("iface %p, loader %p, processor %p, result %p, object %p stub!\n", + iface, loader, processor, result, object); + return E_NOTIMPL; +} + +static UINT WINAPI thread_pump_GetWorkItemCount(ID3DX10ThreadPump *iface) +{ + FIXME("iface %p stub!\n", iface); + return 0; +} + +static HRESULT WINAPI thread_pump_WaitForAllItems(ID3DX10ThreadPump *iface) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI thread_pump_ProcessDeviceWorkItems(ID3DX10ThreadPump *iface, UINT count) +{ + FIXME("iface %p, count %u stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI thread_pump_PurgeAllItems(ID3DX10ThreadPump *iface) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI thread_pump_GetQueueStatus(ID3DX10ThreadPump *iface, + UINT *io_queue, UINT *process_queue, UINT *device_queue) +{ + FIXME("iface %p, io_queue %p, process_queue %p, device_queue %p stub!\n", + iface, io_queue, process_queue, device_queue); + return E_NOTIMPL; +} + +static const ID3DX10ThreadPumpVtbl thread_pump_vtbl = +{ + thread_pump_QueryInterface, + thread_pump_AddRef, + thread_pump_Release, + thread_pump_AddWorkItem, + thread_pump_GetWorkItemCount, + thread_pump_WaitForAllItems, + thread_pump_ProcessDeviceWorkItems, + thread_pump_PurgeAllItems, + thread_pump_GetQueueStatus +}; + +HRESULT WINAPI D3DX10CreateThreadPump(UINT io_threads, UINT proc_threads, ID3DX10ThreadPump **pump) +{ + struct thread_pump *object; + + TRACE("io_threads %u, proc_threads %u, pump %p.\n", io_threads, proc_threads, pump); + + if (io_threads >= 1024 || proc_threads >= 1024) + return E_FAIL; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10ThreadPump_iface.lpVtbl = &thread_pump_vtbl; + object->refcount = 1; + + *pump = &object->ID3DX10ThreadPump_iface; + return S_OK; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 95160a067c5..2359c7c6f02 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -1,4 +1,4 @@ -@ stub D3DX10CreateThreadPump(long long ptr) +@ stdcall D3DX10CreateThreadPump(long long ptr) @ stdcall D3DX10CheckVersion(long long) @ stub D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) diff --git a/include/d3dx10core.h b/include/d3dx10core.h index a9ba7854e90..cca9052cc13 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -298,3 +298,4 @@ HRESULT WINAPI D3DX10CreateFontW(ID3D10Device *device, INT height, UINT width, U UINT miplevels, BOOL italic, UINT charset, UINT precision, UINT quality, UINT pitchandfamily, const WCHAR *facename, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite); +HRESULT WINAPI D3DX10CreateThreadPump(UINT io_threads, UINT proc_threads, ID3DX10ThreadPump **pump);

1 0

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 6ae162fac1d14a628a7f1760a5ad3ddd70bca2c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae162fac1d14a628a7f1760… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 19:37:23 2022 +0200 d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 245 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 7913f634c21..b22967e13fd 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -23,6 +23,7 @@ #include "dxhelpers.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -610,10 +611,47 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si return E_NOTIMPL; } +struct work_item +{ + struct list entry; + + ID3DX10DataLoader *loader; + ID3DX10DataProcessor *processor; + HRESULT *result; + void **object; +}; + +static inline void work_item_free(struct work_item *work_item, BOOL cancel) +{ + ID3DX10DataLoader_Destroy(work_item->loader); + ID3DX10DataProcessor_Destroy(work_item->processor); + if (cancel && work_item->result) + *work_item->result = S_FALSE; + free(work_item); +} + +#define THREAD_PUMP_EXITING UINT_MAX struct thread_pump { ID3DX10ThreadPump ID3DX10ThreadPump_iface; LONG refcount; + + SRWLOCK io_lock; + CONDITION_VARIABLE io_cv; + unsigned int io_count; + struct list io_queue; + + SRWLOCK proc_lock; + CONDITION_VARIABLE proc_cv; + unsigned int proc_count; + struct list proc_queue; + + SRWLOCK device_lock; + unsigned int device_count; + struct list device_queue; + + unsigned int thread_count; + HANDLE threads[1]; }; static inline struct thread_pump *impl_from_ID3DX10ThreadPump(ID3DX10ThreadPump *iface) @@ -652,11 +690,49 @@ static ULONG WINAPI thread_pump_Release(ID3DX10ThreadPump *iface) { struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); ULONG refcount = InterlockedDecrement(&thread_pump->refcount); + struct work_item *item, *next; + struct list list; + unsigned int i; TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) + { + AcquireSRWLockExclusive(&thread_pump->io_lock); + thread_pump->io_count = THREAD_PUMP_EXITING; + ReleaseSRWLockExclusive(&thread_pump->io_lock); + WakeAllConditionVariable(&thread_pump->io_cv); + + AcquireSRWLockExclusive(&thread_pump->proc_lock); + thread_pump->proc_count = THREAD_PUMP_EXITING; + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + WakeAllConditionVariable(&thread_pump->proc_cv); + + AcquireSRWLockExclusive(&thread_pump->device_lock); + thread_pump->device_count = THREAD_PUMP_EXITING; + ReleaseSRWLockExclusive(&thread_pump->device_lock); + + for (i = 0; i < thread_pump->thread_count; ++i) + { + if (!thread_pump->threads[i]) + continue; + + WaitForSingleObject(thread_pump->threads[i], INFINITE); + CloseHandle(thread_pump->threads[i]); + } + + list_init(&list); + list_move_tail(&list, &thread_pump->io_queue); + list_move_tail(&list, &thread_pump->proc_queue); + list_move_tail(&list, &thread_pump->device_queue); + LIST_FOR_EACH_ENTRY_SAFE(item, next, &list, struct work_item, entry) + { + list_remove(&item->entry); + work_item_free(item, TRUE); + } + free(thread_pump); + } return refcount; } @@ -664,9 +740,30 @@ static ULONG WINAPI thread_pump_Release(ID3DX10ThreadPump *iface) static HRESULT WINAPI thread_pump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10DataLoader *loader, ID3DX10DataProcessor *processor, HRESULT *result, void **object) { - FIXME("iface %p, loader %p, processor %p, result %p, object %p stub!\n", + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + struct work_item *work_item; + + TRACE("iface %p, loader %p, processor %p, result %p, object %p.\n", iface, loader, processor, result, object); - return E_NOTIMPL; + + work_item = malloc(sizeof(*work_item)); + if (!work_item) + return E_OUTOFMEMORY; + + work_item->loader = loader; + work_item->processor = processor; + work_item->result = result; + work_item->object = object; + + if (object) + *object = NULL; + + AcquireSRWLockExclusive(&thread_pump->io_lock); + ++thread_pump->io_count; + list_add_tail(&thread_pump->io_queue, &work_item->entry); + ReleaseSRWLockExclusive(&thread_pump->io_lock); + WakeConditionVariable(&thread_pump->io_cv); + return S_OK; } static UINT WINAPI thread_pump_GetWorkItemCount(ID3DX10ThreadPump *iface) @@ -714,20 +811,165 @@ static const ID3DX10ThreadPumpVtbl thread_pump_vtbl = thread_pump_GetQueueStatus }; +static DWORD WINAPI io_thread(void *arg) +{ + struct thread_pump *thread_pump = arg; + struct work_item *work_item; + HRESULT hr; + + TRACE("%p thread started.\n", thread_pump); + + for (;;) + { + AcquireSRWLockExclusive(&thread_pump->io_lock); + + while (!thread_pump->io_count) + SleepConditionVariableSRW(&thread_pump->io_cv, &thread_pump->io_lock, INFINITE, 0); + + if (thread_pump->io_count == THREAD_PUMP_EXITING) + { + ReleaseSRWLockExclusive(&thread_pump->io_lock); + return 0; + } + + --thread_pump->io_count; + work_item = LIST_ENTRY(list_head(&thread_pump->io_queue), struct work_item, entry); + list_remove(&work_item->entry); + ReleaseSRWLockExclusive(&thread_pump->io_lock); + + if (FAILED(hr = ID3DX10DataLoader_Load(work_item->loader))) + { + if (work_item->result) + *work_item->result = hr; + work_item_free(work_item, FALSE); + continue; + } + + AcquireSRWLockExclusive(&thread_pump->proc_lock); + if (thread_pump->proc_count == THREAD_PUMP_EXITING) + { + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + work_item_free(work_item, TRUE); + return 0; + } + + list_add_tail(&thread_pump->proc_queue, &work_item->entry); + ++thread_pump->proc_count; + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + WakeConditionVariable(&thread_pump->proc_cv); + } + return 0; +} + +static DWORD WINAPI proc_thread(void *arg) +{ + struct thread_pump *thread_pump = arg; + struct work_item *work_item; + SIZE_T size; + void *data; + HRESULT hr; + + TRACE("%p thread started.\n", thread_pump); + + for (;;) + { + AcquireSRWLockExclusive(&thread_pump->proc_lock); + + while (!thread_pump->proc_count) + SleepConditionVariableSRW(&thread_pump->proc_cv, &thread_pump->proc_lock, INFINITE, 0); + + if (thread_pump->proc_count == THREAD_PUMP_EXITING) + { + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + return 0; + } + + --thread_pump->proc_count; + work_item = LIST_ENTRY(list_head(&thread_pump->proc_queue), struct work_item, entry); + list_remove(&work_item->entry); + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + + if (FAILED(hr = ID3DX10DataLoader_Decompress(work_item->loader, &data, &size))) + { + if (work_item->result) + *work_item->result = hr; + work_item_free(work_item, FALSE); + continue; + } + + if (thread_pump->device_count == THREAD_PUMP_EXITING) + { + work_item_free(work_item, TRUE); + return 0; + } + + if (FAILED(hr = ID3DX10DataProcessor_Process(work_item->processor, data, size))) + { + if (work_item->result) + *work_item->result = hr; + work_item_free(work_item, FALSE); + continue; + } + + AcquireSRWLockExclusive(&thread_pump->device_lock); + if (thread_pump->device_count == THREAD_PUMP_EXITING) + { + ReleaseSRWLockExclusive(&thread_pump->device_lock); + work_item_free(work_item, TRUE); + return 0; + } + + list_add_tail(&thread_pump->device_queue, &work_item->entry); + ++thread_pump->device_count; + ReleaseSRWLockExclusive(&thread_pump->device_lock); + } + return 0; +} + HRESULT WINAPI D3DX10CreateThreadPump(UINT io_threads, UINT proc_threads, ID3DX10ThreadPump **pump) { struct thread_pump *object; + unsigned int i; TRACE("io_threads %u, proc_threads %u, pump %p.\n", io_threads, proc_threads, pump); if (io_threads >= 1024 || proc_threads >= 1024) return E_FAIL; - if (!(object = calloc(1, sizeof(*object)))) + if (!io_threads) + io_threads = 1; + if (!proc_threads) + { + SYSTEM_INFO info; + + GetSystemInfo(&info); + proc_threads = info.dwNumberOfProcessors; + } + + if (!(object = calloc(1, FIELD_OFFSET(struct thread_pump, threads[io_threads + proc_threads])))) return E_OUTOFMEMORY; object->ID3DX10ThreadPump_iface.lpVtbl = &thread_pump_vtbl; object->refcount = 1; + InitializeSRWLock(&object->io_lock); + InitializeConditionVariable(&object->io_cv); + list_init(&object->io_queue); + InitializeSRWLock(&object->proc_lock); + InitializeConditionVariable(&object->proc_cv); + list_init(&object->proc_queue); + InitializeSRWLock(&object->device_lock); + list_init(&object->device_queue); + object->thread_count = io_threads + proc_threads; + + for (i = 0; i < object->thread_count; ++i) + { + object->threads[i] = CreateThread(NULL, 0, i < io_threads ? io_thread : proc_thread, object, 0, NULL); + if (!object->threads[i]) + { + ID3DX10ThreadPump_Release(&object->ID3DX10ThreadPump_iface); + return E_FAIL; + } + } *pump = &object->ID3DX10ThreadPump_iface; return S_OK;

1 0

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 731bffa013e1db452e7839d274c767e5d64e52b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731bffa013e1db452e7839d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 19:48:10 2022 +0200 d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index b22967e13fd..2eb27d0f535 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -636,6 +636,8 @@ struct thread_pump ID3DX10ThreadPump ID3DX10ThreadPump_iface; LONG refcount; + LONG processing_count; + SRWLOCK io_lock; CONDITION_VARIABLE io_cv; unsigned int io_count; @@ -758,6 +760,7 @@ static HRESULT WINAPI thread_pump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10D if (object) *object = NULL; + InterlockedIncrement(&thread_pump->processing_count); AcquireSRWLockExclusive(&thread_pump->io_lock); ++thread_pump->io_count; list_add_tail(&thread_pump->io_queue, &work_item->entry); @@ -768,8 +771,15 @@ static HRESULT WINAPI thread_pump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10D static UINT WINAPI thread_pump_GetWorkItemCount(ID3DX10ThreadPump *iface) { - FIXME("iface %p stub!\n", iface); - return 0; + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + UINT ret; + + TRACE("iface %p.\n", iface); + + AcquireSRWLockExclusive(&thread_pump->device_lock); + ret = thread_pump->processing_count + thread_pump->device_count; + ReleaseSRWLockExclusive(&thread_pump->device_lock); + return ret; } static HRESULT WINAPI thread_pump_WaitForAllItems(ID3DX10ThreadPump *iface) @@ -842,6 +852,7 @@ static DWORD WINAPI io_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); + InterlockedDecrement(&thread_pump->processing_count); continue; } @@ -894,6 +905,7 @@ static DWORD WINAPI proc_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); + InterlockedDecrement(&thread_pump->processing_count); continue; } @@ -908,6 +920,7 @@ static DWORD WINAPI proc_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); + InterlockedDecrement(&thread_pump->processing_count); continue; } @@ -921,6 +934,7 @@ static DWORD WINAPI proc_thread(void *arg) list_add_tail(&thread_pump->device_queue, &work_item->entry); ++thread_pump->device_count; + InterlockedDecrement(&thread_pump->processing_count); ReleaseSRWLockExclusive(&thread_pump->device_lock); } return 0;

1 0

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:ProcessDeviceWorkItems implementation.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 0522fcd4a08195780032d612c255651877dff71d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0522fcd4a08195780032d612… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 20:40:55 2022 +0200 d3dx10: Add ID3DX10ThreadPump:ProcessDeviceWorkItems implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 2eb27d0f535..5aaaabc041f 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -790,8 +790,34 @@ static HRESULT WINAPI thread_pump_WaitForAllItems(ID3DX10ThreadPump *iface) static HRESULT WINAPI thread_pump_ProcessDeviceWorkItems(ID3DX10ThreadPump *iface, UINT count) { - FIXME("iface %p, count %u stub!\n", iface, count); - return E_NOTIMPL; + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + struct work_item *work_item; + HRESULT hr; + UINT i; + + TRACE("iface %p, count %u.\n", iface, count); + + for (i = 0; i < count; ++i) + { + AcquireSRWLockExclusive(&thread_pump->device_lock); + if (!thread_pump->device_count) + { + ReleaseSRWLockExclusive(&thread_pump->device_lock); + break; + } + + --thread_pump->device_count; + work_item = LIST_ENTRY(list_head(&thread_pump->device_queue), struct work_item, entry); + list_remove(&work_item->entry); + ReleaseSRWLockExclusive(&thread_pump->device_lock); + + hr = ID3DX10DataProcessor_CreateDeviceObject(work_item->processor, work_item->object); + if (work_item->result) + *work_item->result = hr; + work_item_free(work_item, FALSE); + } + + return S_OK; } static HRESULT WINAPI thread_pump_PurgeAllItems(ID3DX10ThreadPump *iface)

1 0

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:WaitForAllItems implementation.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: ec6e12cda3d9820da26f8e40d60da0e8a7c67797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6e12cda3d9820da26f8e40… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 20:31:01 2022 +0200 d3dx10: Add ID3DX10ThreadPump:WaitForAllItems implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 5aaaabc041f..9573195cdab 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -21,6 +21,7 @@ #include "d3dx10.h" #include "d3dcompiler.h" #include "dxhelpers.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/list.h" @@ -784,8 +785,32 @@ static UINT WINAPI thread_pump_GetWorkItemCount(ID3DX10ThreadPump *iface) static HRESULT WINAPI thread_pump_WaitForAllItems(ID3DX10ThreadPump *iface) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + HRESULT hr; + LONG v; + + TRACE("iface %p.\n", iface); + + for (;;) + { + if (FAILED((hr = ID3DX10ThreadPump_ProcessDeviceWorkItems(iface, UINT_MAX)))) + return hr; + + AcquireSRWLockExclusive(&thread_pump->device_lock); + if (thread_pump->device_count) + { + ReleaseSRWLockExclusive(&thread_pump->device_lock); + continue; + } + v = thread_pump->processing_count; + ReleaseSRWLockExclusive(&thread_pump->device_lock); + if (!v) + break; + + RtlWaitOnAddress(&thread_pump->processing_count, &v, sizeof(v), NULL); + } + + return S_OK; } static HRESULT WINAPI thread_pump_ProcessDeviceWorkItems(ID3DX10ThreadPump *iface, UINT count) @@ -878,7 +903,8 @@ static DWORD WINAPI io_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); - InterlockedDecrement(&thread_pump->processing_count); + if (!InterlockedDecrement(&thread_pump->processing_count)) + RtlWakeAddressAll(&thread_pump->processing_count); continue; } @@ -931,7 +957,8 @@ static DWORD WINAPI proc_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); - InterlockedDecrement(&thread_pump->processing_count); + if (!InterlockedDecrement(&thread_pump->processing_count)) + RtlWakeAddressAll(&thread_pump->processing_count); continue; } @@ -946,7 +973,8 @@ static DWORD WINAPI proc_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); - InterlockedDecrement(&thread_pump->processing_count); + if (!InterlockedDecrement(&thread_pump->processing_count)) + RtlWakeAddressAll(&thread_pump->processing_count); continue; } @@ -961,6 +989,7 @@ static DWORD WINAPI proc_thread(void *arg) list_add_tail(&thread_pump->device_queue, &work_item->entry); ++thread_pump->device_count; InterlockedDecrement(&thread_pump->processing_count); + RtlWakeAddressAll(&thread_pump->processing_count); ReleaseSRWLockExclusive(&thread_pump->device_lock); } return 0;

1 0