wine-devel March 2021

wine-devel@winehq.org

75 participants
800 discussions

[PATCH 1/2] include: Fix IWMSyncReader2 uuid.
by Gijs Vermeulen 01 Mar '21

01 Mar '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1e0445470dc..716abe056db1 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1093,7 +1093,7 @@ interface IWMReaderAllocatorEx : IUnknown [ object, - uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + uuid(faed3d21-1b6b-4af7-8cb6-3e189bbc187b), pointer_default( unique ), local ] -- 2.30.1

1 1

[PATCH] gdi32: The original family name should be obtained in find_matching_face_by_name().
by Haidong Yu 01 Mar '21

01 Mar '21

1 0

[PATCH 1/3] wbemdisp: Reference Services object in objects it's created.
by Nikolay Sivov 01 Mar '21

01 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 51 ++++++++++++++++++++++------------ dlls/wbemdisp/tests/wbemdisp.c | 11 ++++++++ 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 619f7e5c67f..9e191c07b49 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -43,9 +43,11 @@ static WCHAR *heap_strdupW( const WCHAR *src ) return dst; } -static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +struct services; + +static HRESULT EnumVARIANT_create( struct services *, IEnumWbemClassObject *, IEnumVARIANT ** ); static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); -static HRESULT SWbemObject_create( IWbemClassObject *, ISWbemObject ** ); +static HRESULT SWbemObject_create( struct services *, IWbemClassObject *, ISWbemObject ** ); enum type_id { @@ -513,6 +515,13 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro return S_OK; } +struct services +{ + ISWbemServices ISWbemServices_iface; + LONG refs; + IWbemServices *services; +}; + struct member { BSTR name; @@ -529,6 +538,7 @@ struct object UINT nb_members; DISPID last_dispid; DISPID last_dispid_method; + struct services *services; }; struct methodset @@ -706,7 +716,7 @@ static HRESULT WINAPI method_get_InParameters( IWbemClassObject_Release( in_sign ); if (SUCCEEDED(hr)) { - hr = SWbemObject_create( instance, params ); + hr = SWbemObject_create( method->set->object->services, instance, params ); IWbemClassObject_Release( instance ); } } @@ -995,6 +1005,7 @@ static ULONG WINAPI object_Release( TRACE( "destroying %p\n", object ); IWbemClassObject_Release( object->object ); + ISWbemServices_Release( &object->services->ISWbemServices_iface ); for (i = 0; i < object->nb_members; i++) SysFreeString( object->members[i].name ); heap_free( object->members ); heap_free( object ); @@ -1557,7 +1568,8 @@ static const ISWbemObjectVtbl object_vtbl = object_get_Security_ }; -static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj ) +static HRESULT SWbemObject_create( struct services *services, IWbemClassObject *wbem_object, + ISWbemObject **obj ) { struct object *object; @@ -1572,6 +1584,8 @@ static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject * object->nb_members = 0; object->last_dispid = DISPID_BASE; object->last_dispid_method = DISPID_BASE_METHOD; + object->services = services; + ISWbemServices_AddRef( &object->services->ISWbemServices_iface ); *obj = &object->ISWbemObject_iface; TRACE( "returning iface %p\n", *obj ); @@ -1584,6 +1598,7 @@ struct objectset LONG refs; IEnumWbemClassObject *objectenum; LONG count; + struct services *services; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -1608,6 +1623,7 @@ static ULONG WINAPI objectset_Release( { TRACE( "destroying %p\n", objectset ); IEnumWbemClassObject_Release( objectset->objectenum ); + ISWbemServices_Release( &objectset->services->ISWbemServices_iface ); heap_free( objectset ); } return refs; @@ -1725,7 +1741,7 @@ static HRESULT WINAPI objectset_get__NewEnum( hr = IEnumWbemClassObject_Clone( objectset->objectenum, &objectenum ); if (FAILED( hr )) return hr; - hr = EnumVARIANT_create( objectenum, (IEnumVARIANT **)pUnk ); + hr = EnumVARIANT_create( objectset->services, objectenum, (IEnumVARIANT **)pUnk ); IEnumWbemClassObject_Release( objectenum ); return hr; } @@ -1824,7 +1840,8 @@ static LONG get_object_count( IEnumWbemClassObject *iter ) return count; } -static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) +static HRESULT SWbemObjectSet_create( struct services *services, IEnumWbemClassObject *wbem_objectenum, + ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -1836,6 +1853,8 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); objectset->count = get_object_count( objectset->objectenum ); + objectset->services = services; + ISWbemServices_AddRef( &services->ISWbemServices_iface ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj ); @@ -1847,6 +1866,7 @@ struct enumvar IEnumVARIANT IEnumVARIANT_iface; LONG refs; IEnumWbemClassObject *objectenum; + struct services *services; }; static inline struct enumvar *impl_from_IEnumVARIANT( @@ -1871,6 +1891,7 @@ static ULONG WINAPI enumvar_Release( { TRACE( "destroying %p\n", enumvar ); IEnumWbemClassObject_Release( enumvar->objectenum ); + ISWbemServices_Release( &enumvar->services->ISWbemServices_iface ); heap_free( enumvar ); } return refs; @@ -1913,7 +1934,7 @@ static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *va ISWbemObject *sobj; HRESULT hr; - hr = SWbemObject_create( obj, &sobj ); + hr = SWbemObject_create( enumvar->services, obj, &sobj ); IWbemClassObject_Release( obj ); if (FAILED( hr )) return hr; @@ -1959,7 +1980,8 @@ static const struct IEnumVARIANTVtbl enumvar_vtbl = enumvar_Clone }; -static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIANT **obj ) +static HRESULT EnumVARIANT_create( struct services *services, IEnumWbemClassObject *objectenum, + IEnumVARIANT **obj ) { struct enumvar *enumvar; @@ -1968,19 +1990,14 @@ static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIAN enumvar->refs = 1; enumvar->objectenum = objectenum; IEnumWbemClassObject_AddRef( enumvar->objectenum ); + enumvar->services = services; + ISWbemServices_AddRef( &services->ISWbemServices_iface ); *obj = &enumvar->IEnumVARIANT_iface; TRACE( "returning iface %p\n", *obj ); return S_OK; } -struct services -{ - ISWbemServices ISWbemServices_iface; - LONG refs; - IWbemServices *services; -}; - static inline struct services *impl_from_ISWbemServices( ISWbemServices *iface ) { @@ -2127,7 +2144,7 @@ static HRESULT WINAPI services_Get( hr = IWbemServices_GetObject( services->services, strObjectPath, iFlags, NULL, &obj, NULL ); if (hr != S_OK) return hr; - hr = SWbemObject_create( obj, objWbemObject ); + hr = SWbemObject_create( services, obj, objWbemObject ); IWbemClassObject_Release( obj ); return hr; } @@ -2256,7 +2273,7 @@ static HRESULT WINAPI services_ExecQuery( hr = IWbemServices_ExecQuery( services->services, strQueryLanguage, strQuery, iFlags, NULL, &iter ); if (hr != S_OK) return hr; - hr = SWbemObjectSet_create( iter, objWbemObjectSet ); + hr = SWbemObjectSet_create( services, iter, objWbemObjectSet ); IEnumWbemClassObject_Release( iter ); return hr; } diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index c38a0f14c9b..bf44f62329a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -279,6 +279,15 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_locator(void) { HRESULT hr; @@ -307,12 +316,14 @@ static void test_locator(void) SysFreeString( root_bstr ); SysFreeString( host_bstr ); + EXPECT_REF( services, 1 ); query_bstr = SysAllocString( L"Select ProcessorId from Win32_Processor" ); lang_bstr = SysAllocString( L"WQL" ); hr = ISWbemServices_ExecQuery( services, query_bstr, lang_bstr, wbemFlagForwardOnly, NULL, &object_set); ok( hr == S_OK, "got %x\n", hr ); SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + EXPECT_REF( services, 2 ); hr = ISWbemLocator_get_Security_( locator, &security ); ok( hr == S_OK, "got %x\n", hr ); -- 2.30.1

3 7

[PATCH 1/3] wbemprox: Implement SetStringValue() method.
by Nikolay Sivov 01 Mar '21

01 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 15 +++++++- dlls/wbemprox/reg.c | 65 ++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 498e3f6fc79..47fc2fb7367 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -393,6 +393,7 @@ static const struct column col_stdregprov[] = { L"EnumKey", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"EnumValues", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"GetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"SetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_systemenclosure[] = { @@ -802,6 +803,7 @@ struct record_stdregprov class_method *enumkey; class_method *enumvalues; class_method *getstringvalue; + class_method *setstringvalue; }; struct record_sysrestore { @@ -898,6 +900,11 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"SetStringValue", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", 1, L"sValueName", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", 1, L"sValue", CIM_STRING }, + { L"StdRegProv", L"SetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, @@ -930,7 +937,13 @@ static const struct record_quickfixengineering data_quickfixengineering[] = static const struct record_stdregprov data_stdregprov[] = { - { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } + { + reg_create_key, + reg_enum_key, + reg_enum_values, + reg_get_stringvalue, + reg_set_stringvalue, + } }; static const struct record_sysrestore data_sysrestore[] = diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index ec5a8191424..46b089ca8e8 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -442,3 +442,68 @@ done: if (out_params) IWbemClassObject_Release( out_params ); return hr; } + +static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, const WCHAR *value, VARIANT *retval ) +{ + LONG res; + + TRACE("%p, %s, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name), debugstr_w(value)); + + res = RegSetKeyValueW( root, subkey, name, REG_SZ, value, (lstrlenW( value ) + 1) * sizeof(*value) ); + set_variant( VT_UI4, res, NULL, retval ); +} + +HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT defkey, subkey, name, value, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, L"sValue", 0, &value, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"StdRegProv", L"SetStringValue", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + VariantClear( &value ); + return hr; + } + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + VariantClear( &value ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + set_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_BSTR(&value), &retval ); + if (out_params) + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + + VariantClear( &name ); + VariantClear( &subkey ); + VariantClear( &value ); + IWbemClassObject_Release( sig ); + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ac857b859e8..31f41e9fc81 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -248,6 +248,7 @@ HRESULT reg_create_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT reg_set_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_resume_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -- 2.30.1

2 5

[PATCH] ntdll: Fix loading .so dlls
by Andre Heider 01 Mar '21

01 Mar '21

Fixes: 93eb4dbd "ntdll: Add a separate helper for creating the initial ntdll module." Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 644eee1e9d7..c21c62c10b0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, SECTION_IMAGE_INFORMATION image_info = { 0 }; image_info.u.s.WineBuiltin = 1; - if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, pwm ))) + if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, &wm ))) { if (module) unix_funcs->unload_builtin_dll( module ); return status; -- 2.30.1

2 1

[PATCH 5/5] comctl32: Remove unnecessary OffsetRect() calls.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Target rectangles are already offset by previous OffsetRect() calls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 1 - dlls/comctl32/listbox.c | 1 - dlls/comctl32/listview.c | 1 - dlls/comctl32/treeview.c | 1 - 4 files changed, 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 4ad46357d96..06e0497ab98 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3667,7 +3667,6 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) OffsetRect(&r, -r.left, -r.top); dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(hwnd, dc, &r); diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 137b08ce678..239f54aafab 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1211,7 +1211,6 @@ static LRESULT LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) OffsetRect(&r, -r.left, -r.top); hdc = GetDCEx(descr->self, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(descr->self, hdc, &r); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0a05c0668ae..a62ac4398cc 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10636,7 +10636,6 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) OffsetRect(&r, -r.left, -r.top); dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwndSelf, dc, &r); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0e4a92a466f..a45096d8239 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5459,7 +5459,6 @@ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM OffsetRect(&r, -r.left, -r.top); dc = GetDCEx(infoPtr->hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwnd, dc, &r); -- 2.27.0

2 1

[PATCH 4/5] comdlg32: Fix a memory leak.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/colordlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 7ab5efd0962..d5254736b24 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -523,6 +523,7 @@ static void CC_PaintCross(CCPRIV *infoPtr) int wc = GetDialogBaseUnits() * 3 / 4; RECT rect; POINT point, p; + HRGN region; HPEN hPen; int x, y; @@ -531,7 +532,9 @@ static void CC_PaintCross(CCPRIV *infoPtr) GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); - SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); + region = CreateRectRgnIndirect(&rect); + SelectClipRgn(hDC, region); + DeleteObject(region); point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; -- 2.27.0

2 1

[PATCH 3/5] user32: Fix memory leaks.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 5 ++++- dlls/user32/nonclient.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 515341f65ea..4e8e7f7db44 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2633,7 +2633,10 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; e = s; - hrgn = CreateRectRgn(0, 0, 0, 0); + if (hrgn) + SetRectRgn(hrgn, 0, 0, 0, 0); + else + hrgn = CreateRectRgn(0, 0, 0, 0); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 8cfd3c0d371..e56c03deaf0 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -976,7 +976,11 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) hdc = GetDCEx( hwnd, hrgn, DCX_USESTYLE | DCX_WINDOW | DCX_EXCLUDERGN ); } - if (!hdc) return; + if (!hdc) + { + DeleteObject( hrgn ); + return; + } WIN_GetRectangles( hwnd, COORDS_WINDOW, &rect, NULL ); GetClipBox( hdc, &rectClip ); -- 2.27.0

2 1

[PATCH 2/5] comctl32: Fix memory leaks.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 7 ++++++- dlls/comctl32/listview.c | 1 + dlls/comctl32/treeview.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f84ef1eb168..4ad46357d96 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2514,7 +2514,10 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; e = s; - hrgn = CreateRectRgn(0, 0, 0, 0); + if (hrgn) + SetRectRgn(hrgn, 0, 0, 0, 0); + else + hrgn = CreateRectRgn(0, 0, 0, 0); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } @@ -3674,6 +3677,8 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) /* Call default proc to get the scrollbars etc. also painted */ DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); + if (cliprgn != region) + DeleteObject(cliprgn); } /********************************************************************* diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0c80b6164a9..0a05c0668ae 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10645,6 +10645,7 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) /* Call default proc to get the scrollbars etc. painted */ DefWindowProcW (infoPtr->hwndSelf, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); return FALSE; } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7f9a6f88cee..0e4a92a466f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5468,6 +5468,7 @@ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM /* Call default proc to get the scrollbars etc. painted */ DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); return TRUE; } -- 2.27.0

1 0

[PATCH 1/5] comctl32/listbox: Actually draw themed frame.
by Zhiyi Zhang 01 Mar '21

01 Mar '21

Previously, LISTBOX_NCPaint() is called and themed frame is drawn. And then DefWindowProcW() is called with original clip region, overwriting the drawn themed frame. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/listbox.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b905beee325..137b08ce678 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1186,7 +1186,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) return 0; } -static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) +static LRESULT LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) { DWORD exstyle = GetWindowLongW( descr->self, GWL_EXSTYLE); HTHEME theme = GetWindowTheme( descr->self ); @@ -1196,7 +1196,7 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) RECT r; if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) - return; + return DefWindowProcW(descr->self, WM_NCPAINT, (WPARAM)region, 0); cxEdge = GetSystemMetrics(SM_CXEDGE); cyEdge = GetSystemMetrics(SM_CYEDGE); @@ -1217,6 +1217,11 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) DrawThemeParentBackground(descr->self, hdc, &r); DrawThemeBackground (theme, hdc, 0, 0, &r, 0); ReleaseDC(descr->self, hdc); + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW(descr->self, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); + return 0; } /*********************************************************************** @@ -2976,8 +2981,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, return ret; case WM_NCPAINT: - LISTBOX_NCPaint( descr, (HRGN)wParam ); - break; + return LISTBOX_NCPaint( descr, (HRGN)wParam ); case WM_SIZE: LISTBOX_UpdateSize( descr ); -- 2.27.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2021