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

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

04 Jul '22

Module: wine Branch: master Commit: 3c5cae06bf6e642c32ba1089506af7a0ccaed466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c5cae06bf6e642c32ba1089… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 20:44:31 2022 +0200 d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 9573195cdab..8fc232681c5 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -854,9 +854,15 @@ static HRESULT WINAPI thread_pump_PurgeAllItems(ID3DX10ThreadPump *iface) 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", + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + + TRACE("iface %p, io_queue %p, process_queue %p, device_queue %p.\n", iface, io_queue, process_queue, device_queue); - return E_NOTIMPL; + + *io_queue = thread_pump->io_count; + *process_queue = thread_pump->proc_count; + *device_queue = thread_pump->device_count; + return S_OK; } static const ID3DX10ThreadPumpVtbl thread_pump_vtbl =

1 0

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

04 Jul '22

Module: wine Branch: master Commit: a63f7b1c815123770b7e3c9a3faa0d7ddc61c66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63f7b1c815123770b7e3c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 21:02:53 2022 +0200 d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 8fc232681c5..667219b3500 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -845,10 +845,52 @@ static HRESULT WINAPI thread_pump_ProcessDeviceWorkItems(ID3DX10ThreadPump *ifac return S_OK; } +static void purge_list(struct list *list, LONG *count) +{ + struct work_item *work_item; + + while (!list_empty(list)) + { + work_item = LIST_ENTRY(list_head(list), struct work_item, entry); + list_remove(&work_item->entry); + work_item_free(work_item, TRUE); + + if (count && !InterlockedDecrement(count)) + RtlWakeAddressAll(count); + } +} + static HRESULT WINAPI thread_pump_PurgeAllItems(ID3DX10ThreadPump *iface) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + LONG v; + + TRACE("iface %p.\n", iface); + + for (;;) + { + AcquireSRWLockExclusive(&thread_pump->io_lock); + purge_list(&thread_pump->io_queue, &thread_pump->processing_count); + thread_pump->io_count = 0; + ReleaseSRWLockExclusive(&thread_pump->io_lock); + + AcquireSRWLockExclusive(&thread_pump->proc_lock); + purge_list(&thread_pump->proc_queue, &thread_pump->processing_count); + thread_pump->proc_count = 0; + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + + AcquireSRWLockExclusive(&thread_pump->device_lock); + purge_list(&thread_pump->device_queue, NULL); + thread_pump->device_count = 0; + 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_GetQueueStatus(ID3DX10ThreadPump *iface,

1 0

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

04 Jul '22

Module: wine Branch: master Commit: a304924c61eac2dd2311160d30e24e61a3131de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a304924c61eac2dd2311160d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 15:14:34 2022 +0200 d3dx10/tests: Add D3DX10CreateThreadPump tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 373 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a304924c61eac2dd2311…

1 0

Nikolay Sivov : xmllite/reader: Use correct byte length when updating utf16 buffer contents marker.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: a49a2abff103193fae9cc26ebca2d69a6f8e41c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49a2abff103193fae9cc26e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 17:44:22 2022 +0300 xmllite/reader: Use correct byte length when updating utf16 buffer contents marker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d99f121e0cb..118b7bd5ea2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1030,7 +1030,7 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding { readerinput_grow(readerinput, len); memcpy(dest->data, src->data + src->cur, len); - dest->written += len*sizeof(WCHAR); + dest->written += len; } else { @@ -1084,7 +1084,7 @@ static HRESULT reader_more(xmlreader *reader) { readerinput_grow(readerinput, len); memcpy(dest->data + dest->written, src->data + src->cur, len); - dest->written += len*sizeof(WCHAR); + dest->written += len; } else {

1 0

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

04 Jul '22

Module: wine Branch: master Commit: 258b57a1ce4edbaf07a2f7d7b20e101c142a03d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=258b57a1ce4edbaf07a2f7d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 15:36:11 2022 +0300 d2d1/effect: Support parsing vector2 property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 17 +++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 5daf16fd838..7cfed6577c4 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -229,6 +229,35 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +/* Same syntax is used for value and default values. */ +static HRESULT d2d_effect_parse_vector_value(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); + + 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); + if (value == end_ptr) return E_INVALIDARG; + value = end_ptr; + + /* Trailing characters after last component are ignored. */ + if (i == num_components - 1) continue; + if (*(value++) != ',') return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties *props, const WCHAR *name, UINT32 index, BOOL subprop, D2D1_PROPERTY_TYPE type, const WCHAR *value) { @@ -255,6 +284,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * sizeof(void *), /* D2D1_PROPERTY_TYPE_COLOR_CONTEXT */ }; struct d2d_effect_property *p; + HRESULT hr; assert(type >= D2D1_PROPERTY_TYPE_STRING && type <= D2D1_PROPERTY_TYPE_COLOR_CONTEXT); @@ -302,6 +332,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * { void *src = NULL; UINT32 _uint32; + float _vec[4]; CLSID _clsid; BOOL _bool; @@ -328,6 +359,14 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * CLSIDFromString(value, &_clsid); src = &_clsid; break; + case D2D1_PROPERTY_TYPE_VECTOR2: + if (FAILED(hr = d2d_effect_parse_vector_value(p->type, value, _vec))) + { + WARN("Failed to parse vector value %s.\n", wine_dbgstr_w(value)); + return hr; + } + src = _vec; + break; case D2D1_PROPERTY_TYPE_IUNKNOWN: case D2D1_PROPERTY_TYPE_COLOR_CONTEXT: break; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9dfe1e760ba..b7eab5003d7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -54,6 +54,10 @@ L"<?xml version='1.0'?> \ <Property name='DisplayName' type='string' value='Bool property'/> \ <Property name='Default' type='bool' value='false'/> \ </Property> \ + <Property name='Vec2Prop' type='vector2' value='( 3.0, 4.0)'> \ + <Property name='DisplayName' type='string' value='Vec2 prop'/> \ + <Property name='Default' type='vector2' value='(1.0, 2.0)'/> \ + </Property> \ </Effect> \ "; @@ -11029,6 +11033,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; + float vec2[2]; CLSID clsid; BOOL cached; HRESULT hr; @@ -11119,6 +11124,18 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"IsReadOnly"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); ID2D1Properties_Release(subproperties); + + /* Vector2 property */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Vec2Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Vec2Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR2, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR2, (BYTE *)vec2, sizeof(vec2)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(vec2[0] == 3.0f && vec2[1] == 4.0f, "Unexpected vector (%.8e,%.8e).\n", vec2[0], vec2[1]); + ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect);

1 0

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

04 Jul '22

Module: wine Branch: master Commit: 3c2ce1039c1e9e9f25ebf7f4cb56b8a508322ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2ce1039c1e9e9f25ebf7f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 15:40:52 2022 +0300 d2d1/effect: Support parsing vector3 property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7cfed6577c4..a2cb08ac873 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -360,6 +360,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * src = &_clsid; break; case D2D1_PROPERTY_TYPE_VECTOR2: + case D2D1_PROPERTY_TYPE_VECTOR3: if (FAILED(hr = d2d_effect_parse_vector_value(p->type, value, _vec))) { WARN("Failed to parse vector value %s.\n", wine_dbgstr_w(value)); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b7eab5003d7..f76ad185f3e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -58,6 +58,10 @@ L"<?xml version='1.0'?> \ <Property name='DisplayName' type='string' value='Vec2 prop'/> \ <Property name='Default' type='vector2' value='(1.0, 2.0)'/> \ </Property> \ + <Property name='Vec3Prop' type='vector3' value='(5.0, 6.0, 7.0)'> \ + <Property name='DisplayName' type='string' value='Vec3 prop'/> \ + <Property name='Default' type='vector3' value='(0.1, 0.2, 0.3)'/> \ + </Property> \ </Effect> \ "; @@ -11030,10 +11034,10 @@ static void test_effect_properties(BOOL d3d11) D2D1_PROPERTY_TYPE prop_type; struct d2d1_test_context ctx; ID2D1Factory1 *factory; + float vec2[2], vec3[3]; ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; - float vec2[2]; CLSID clsid; BOOL cached; HRESULT hr; @@ -11125,7 +11129,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Properties_Release(subproperties); - /* Vector2 property */ + /* Vector2 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Vec2Prop"); hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -11136,6 +11140,18 @@ static void test_effect_properties(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(vec2[0] == 3.0f && vec2[1] == 4.0f, "Unexpected vector (%.8e,%.8e).\n", vec2[0], vec2[1]); + /* Vector3 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Vec3Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Vec3Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR3, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR3, (BYTE *)vec3, sizeof(vec3)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(vec3[0] == 5.0f && vec3[1] == 6.0f && vec3[2] == 7.0f, "Unexpected vector (%.8e,%.8e,%.8e).\n", + vec3[0], vec3[1], vec3[2]); + ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect);

1 0

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

04 Jul '22

Module: wine Branch: master Commit: a7ff88c9a28d097b3479c1d6c554af5d83171435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ff88c9a28d097b3479c1d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 21:03:24 2022 +0200 win32u: Move set_standard_scroll_painted implementation from user32. --- dlls/user32/scroll.c | 13 ++----------- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/win32u/dce.c | 6 +++--- dlls/win32u/ntuser_private.h | 15 ++++++++++++++- dlls/win32u/scroll.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + 7 files changed, 50 insertions(+), 17 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d9bc69895aa..9cb07af0706 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -31,16 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); -/* data for a single scroll bar */ -typedef struct -{ - INT curVal; /* Current scroll-bar value */ - INT minVal; /* Minimum scroll-bar value */ - INT maxVal; /* Maximum scroll-bar value */ - INT page; /* Page size of scroll bar (Win32) */ - UINT flags; /* EnableScrollBar flags */ - BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ -} SCROLLBAR_INFO, *LPSCROLLBAR_INFO; +typedef struct scroll_info SCROLLBAR_INFO, *LPSCROLLBAR_INFO; /* data for window that has (one or two) scroll bars */ typedef struct @@ -127,7 +118,7 @@ static inline BOOL SCROLL_ScrollInfoValid( LPCSCROLLINFO info ) * or NULL if failed (f.i. scroll bar does not exist yet) * If alloc is TRUE and the struct does not exist yet, create it. */ -static SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) +SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) { SCROLLBAR_INFO *infoPtr = NULL; WND *wndPtr = WIN_GetPtr( hwnd ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 2391131e4a5..7a85a86d786 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -159,9 +159,9 @@ static const struct user_callbacks user_funcs = NtWaitForMultipleObjects, SCROLL_DrawNCScrollBar, free_win_ptr, + SCROLL_GetInternalInfo, notify_ime, post_dde_message, - SCROLL_SetStandardScrollPainted, unpack_dde_message, register_imm, unregister_imm, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a646f9a234d..f34818ea258 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -179,6 +179,6 @@ LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HID void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL) DECLSPEC_HIDDEN; -void WINAPI SCROLL_SetStandardScrollPainted(HWND hwnd, INT bar, BOOL visible); +struct scroll_info *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ); #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 67590e80fa3..9041b5bbaaf 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1188,14 +1188,14 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) /* NOTE: WM_NCPAINT allows wParam to be 1 */ { - if ((*flags & UPDATE_NONCLIENT) && user_callbacks) + if (*flags & UPDATE_NONCLIENT) { /* Mark standard scroll bars as not painted before sending WM_NCPAINT */ style = get_window_long( hwnd, GWL_STYLE ); if (style & WS_HSCROLL) - user_callbacks->set_standard_scroll_painted( hwnd, SB_HORZ, FALSE ); + set_standard_scroll_painted( hwnd, SB_HORZ, FALSE ); if (style & WS_VSCROLL) - user_callbacks->set_standard_scroll_painted( hwnd, SB_VERT, FALSE ); + set_standard_scroll_painted( hwnd, SB_VERT, FALSE ); send_message( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 82d70ec93bb..609f7018b07 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -37,10 +37,10 @@ struct user_callbacks NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); void (CDECL *draw_nc_scrollbar)( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ); void (CDECL *free_win_ptr)( struct tagWND *win ); + struct scroll_info *(CDECL *get_scroll_info)( HWND hwnd, INT nBar, BOOL alloc ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ); - void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); BOOL (WINAPI *register_imm)( HWND hwnd ); @@ -203,6 +203,19 @@ enum builtin_winprocs NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP }; +/* FIXME: make it private to scroll.c */ + +/* data for a single scroll bar */ +struct scroll_info +{ + INT curVal; /* Current scroll-bar value */ + INT minVal; /* Minimum scroll-bar value */ + INT maxVal; /* Maximum scroll-bar value */ + INT page; /* Page size of scroll bar (Win32) */ + UINT flags; /* EnableScrollBar flags */ + BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ +}; + /* FIXME: make it private to class.c */ typedef struct tagWINDOWPROC { diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index ff60ec5c4ce..d6c21fc6992 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -30,6 +30,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); +static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) +{ + struct scroll_info *ret = NULL; + user_lock(); + if (user_callbacks) ret = user_callbacks->get_scroll_info( hwnd, bar, alloc ); + if (!ret) user_unlock(); + return ret; +} + +static void release_scroll_info_ptr( struct scroll_info *info ) +{ + user_unlock(); +} + static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert ) { ULONG old_style, set_bits = 0, clear_bits = 0; @@ -83,6 +97,20 @@ LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara } } +void set_standard_scroll_painted( HWND hwnd, int bar, BOOL painted ) +{ + struct scroll_info *info; + + if (bar != SB_HORZ && bar != SB_VERT) + return; + + if ((info = get_scroll_info_ptr( hwnd, bar, FALSE ))) + { + info->painted = painted; + release_scroll_info_ptr( info ); + } +} + /************************************************************************* * NtUserShowScrollBar (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 90ca0e9b143..684a5e59c5b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -443,6 +443,7 @@ extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHOR /* scroll.c */ extern LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; +extern void set_standard_scroll_painted( HWND hwnd, int bar, BOOL painted ) DECLSPEC_HIDDEN; /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN;

1 0

Matteo Bruni : d3dx10/tests: Add a couple D3DX10CreateAsyncTextureInfoProcessor() parameter tests.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 89110d1e4c99e3d50378d4137c04f60a8a312029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89110d1e4c99e3d50378d413… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 6 13:54:42 2022 +0200 d3dx10/tests: Add a couple D3DX10CreateAsyncTextureInfoProcessor() parameter tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 1c28a62b700..b70dbb5b44f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1972,6 +1972,22 @@ static void test_D3DX10CreateAsyncTextureInfoProcessor(void) hr = D3DX10CreateAsyncTextureInfoProcessor(NULL, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateAsyncTextureInfoProcessor(&info, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureInfoProcessor(NULL, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (0) + { + /* Crashes on native. */ + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[0].data, test_image[0].size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateAsyncTextureInfoProcessor(&info, &dp); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Eric Pouech : d3dx10/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 07be1c30e57bbdb5b3d17bd84d69806ec938b960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07be1c30e57bbdb5b3d17bd8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 09:37:59 2022 +0100 d3dx10/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_34/tests/Makefile.in | 2 +- dlls/d3dx10_35/tests/Makefile.in | 2 +- dlls/d3dx10_36/tests/Makefile.in | 2 +- dlls/d3dx10_37/tests/Makefile.in | 2 +- dlls/d3dx10_38/tests/Makefile.in | 2 +- dlls/d3dx10_39/tests/Makefile.in | 2 +- dlls/d3dx10_40/tests/Makefile.in | 2 +- dlls/d3dx10_41/tests/Makefile.in | 2 +- dlls/d3dx10_42/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 538 +++++++++++++++++++-------------------- 11 files changed, 279 insertions(+), 279 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07be1c30e57bbdb5b3d1…

1 0

Piotr Caban : d3dx10/tests: Fix texture leak in check_resource_data.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 87e55084694762be4ccf551f0f8ca26840c753a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e55084694762be4ccf551f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 18 21:12:55 2022 +0200 d3dx10/tests: Fix texture leak in check_resource_data. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index c0c14ef592c..c9bdf90eaf4 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1237,7 +1237,7 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag ok_(__FILE__, line)(hr == S_OK, "Map failed, hr %#lx.\n", hr); if (hr != S_OK) { - ID3D10Texture2D_Unmap(readback, 0); + ID3D10Texture2D_Release(readback); return; } @@ -1253,6 +1253,7 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag } ID3D10Texture2D_Unmap(readback, 0); + ID3D10Texture2D_Release(readback); } static void test_D3DX10UnsetAllDeviceObjects(void) @@ -2078,7 +2079,7 @@ static void test_D3DX10CreateAsyncTextureProcessor(void) CoUninitialize(); - ID3D10Device_Release(device); + ok(!ID3D10Device_Release(device), "Unexpected refcount.\n"); } static void test_get_image_info(void) @@ -2433,7 +2434,7 @@ static void test_create_texture(void) CoUninitialize(); - ID3D10Device_Release(device); + ok(!ID3D10Device_Release(device), "Unexpected refcount.\n"); } #define check_rect(rect, left, top, right, bottom) _check_rect(__LINE__, rect, left, top, right, bottom)

1 0