wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Nikolay Sivov : wbemprox: Implement SetDWORDValue() method.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 1e80402e9bfbf5eefe26f910fb972b25ac9e76fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e80402e9bfbf5eefe26f910… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 10:14:45 2021 +0300 wbemprox: Implement SetDWORDValue() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 8 ++++++ dlls/wbemprox/reg.c | 61 ++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 70 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 47fc2fb7367..1a98b16b22c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -394,6 +394,7 @@ static const struct column col_stdregprov[] = { L"EnumValues", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"GetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"SetDWORDValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_systemenclosure[] = { @@ -804,6 +805,7 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; class_method *setstringvalue; + class_method *setdwordvalue; }; struct record_sysrestore { @@ -905,6 +907,11 @@ static const struct record_param data_param[] = { 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"StdRegProv", L"SetDWORDValue", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"SetDWORDValue", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"SetDWORDValue", 1, L"sValueName", CIM_STRING }, + { L"StdRegProv", L"SetDWORDValue", 1, L"uValue", CIM_UINT32 }, + { L"StdRegProv", L"SetDWORDValue", -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 }, @@ -943,6 +950,7 @@ static const struct record_stdregprov data_stdregprov[] = reg_enum_values, reg_get_stringvalue, reg_set_stringvalue, + reg_set_dwordvalue, } }; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 46b089ca8e8..2fb12d9c28c 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -507,3 +507,64 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemC if (out_params) IWbemClassObject_Release( out_params ); return hr; } + +static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, DWORD value, VARIANT *retval ) +{ + LONG res; + + TRACE("%p, %s, %s, %#x\n", root, debugstr_w(subkey), debugstr_w(name), value); + + res = RegSetKeyValueW( root, subkey, name, REG_DWORD, &value, sizeof(value) ); + set_variant( VT_UI4, res, NULL, retval ); +} + +HRESULT reg_set_dwordvalue( 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"uValue", 0, &value, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"StdRegProv", L"SetDWORDValue", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + return hr; + } + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + IWbemClassObject_Release( sig ); + return hr; + } + } + set_dwordvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_UI4(&value), &retval ); + if (out_params) + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + + VariantClear( &name ); + VariantClear( &subkey ); + 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 31f41e9fc81..76ef479c3ef 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -249,6 +249,7 @@ HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject ** 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 reg_set_dwordvalue(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;

1 0

Nikolay Sivov : wbemprox: Implement SetStringValue() method.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 1e01c4f65747a185968ac294a13ecfbe4eb19b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e01c4f65747a185968ac294… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 10:14:44 2021 +0300 wbemprox: Implement SetStringValue() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Nikolay Sivov : oleaut32: Fix VariantChangeType()/VariantChangeTypeEx() prototypes.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 25ec9d4c346d306c2020894b13dca9fa496e31bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ec9d4c346d306c2020894b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 21:25:11 2021 +0300 oleaut32: Fix VariantChangeType()/VariantChangeTypeEx() prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 4 ++-- include/oleauto.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b20ddffab5f..ace33a006f4 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -960,7 +960,7 @@ VariantCopyInd_Return: * The LCID used for the conversion is LOCALE_USER_DEFAULT. * See VariantChangeTypeEx. */ -HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, +HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, const VARIANTARG* pvargSrc, USHORT wFlags, VARTYPE vt) { return VariantChangeTypeEx( pvargDest, pvargSrc, LOCALE_USER_DEFAULT, wFlags, vt ); @@ -986,7 +986,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIAN * pvargDest and pvargSrc can point to the same variant to perform an in-place * conversion. If the conversion is successful, pvargSrc will be freed. */ -HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, +HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvargSrc, LCID lcid, USHORT wFlags, VARTYPE vt) { HRESULT res = S_OK; diff --git a/include/oleauto.h b/include/oleauto.h index 8528b74c02f..45edfbb84af 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -188,8 +188,8 @@ void WINAPI VariantInit(VARIANT*); HRESULT WINAPI VariantClear(VARIANT*); HRESULT WINAPI VariantCopy(VARIANTARG *dst, const VARIANTARG *src); HRESULT WINAPI VariantCopyInd(VARIANT *dst, const VARIANTARG *src); -HRESULT WINAPI VariantChangeType(VARIANT*,VARIANT*,USHORT,VARTYPE); -HRESULT WINAPI VariantChangeTypeEx(VARIANT*,VARIANT*,LCID,USHORT,VARTYPE); +HRESULT WINAPI VariantChangeType(VARIANTARG *dst, const VARIANTARG *src, USHORT flags, VARTYPE vt); +HRESULT WINAPI VariantChangeTypeEx(VARIANTARG *dst, const VARIANTARG *src, LCID lcid, USHORT flags, VARTYPE vt); /* VariantChangeType/VariantChangeTypeEx flags */ #define VARIANT_NOVALUEPROP 0x01 /* Don't get the default value property from IDispatch */

1 0

Nikolay Sivov : oleaut32: Fix VariantCopy()/VariantCopyInd() prototypes.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: a55f4f9fc41234bbb072fa3e6cc9eb204b1d724d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55f4f9fc41234bbb072fa3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 21:25:10 2021 +0300 oleaut32: Fix VariantCopy()/VariantCopyInd() prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 13 +++++++------ include/oleauto.h | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 36191b6b424..b20ddffab5f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -689,10 +689,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) /****************************************************************************** * Copy an IRecordInfo object contained in a variant. */ -static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) +static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, const VARIANT *src) { struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); - struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + const struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); HRESULT hr = S_OK; ULONG size; @@ -745,7 +745,7 @@ static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) * reference count increased using IUnknown_AddRef(). * - For all by-reference types, only the referencing pointer is copied. */ -HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc) +HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, const VARIANTARG* pvargSrc) { HRESULT hres = S_OK; @@ -844,9 +844,10 @@ static inline size_t VARIANT_DataSize(const VARIANT* pv) * pvargDest is always cleared using VariantClear() before pvargSrc is copied * to it. If clearing pvargDest fails, so does this function. */ -HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) +HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) { - VARIANTARG vTmp, *pSrc = pvargSrc; + const VARIANTARG *pSrc = pvargSrc; + VARIANTARG vTmp; VARTYPE vt; HRESULT hres = S_OK; @@ -934,7 +935,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) VariantCopyInd_Return: if (pSrc != pvargSrc) - VariantClear(pSrc); + VariantClear(&vTmp); TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); return hres; diff --git a/include/oleauto.h b/include/oleauto.h index cc50f189475..8528b74c02f 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -186,8 +186,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn void WINAPI VariantInit(VARIANT*); HRESULT WINAPI VariantClear(VARIANT*); -HRESULT WINAPI VariantCopy(VARIANT*,VARIANT*); -HRESULT WINAPI VariantCopyInd(VARIANT*,VARIANT*); +HRESULT WINAPI VariantCopy(VARIANTARG *dst, const VARIANTARG *src); +HRESULT WINAPI VariantCopyInd(VARIANT *dst, const VARIANTARG *src); HRESULT WINAPI VariantChangeType(VARIANT*,VARIANT*,USHORT,VARTYPE); HRESULT WINAPI VariantChangeTypeEx(VARIANT*,VARIANT*,LCID,USHORT,VARTYPE);

1 0

Nikolay Sivov : widl: Remove unnecessary assignment (Coverity).
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 4b2930d3f113f8e6cbefbc13b4442f8646429d55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2930d3f113f8e6cbefbc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 27 17:25:24 2021 +0300 widl: Remove unnecessary assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 16c8b57fd6e..40c1f9d008e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1534,7 +1534,7 @@ static void write_parameterized_type_forward(FILE *header, type_t *type) static void write_parameterized_implementation(FILE *header, type_t *type, int declonly) { const statement_t *stmt; - typeref_list_t *params = params = type->details.parameterized.params; + typeref_list_t *params = type->details.parameterized.params; typeref_t *ref; type_t *iface = type->details.parameterized.type, *base; char *args = NULL;

1 0

Nikolay Sivov : msado15: Fix copy-paste typos in IDispatch methods.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 971be2888be7d1ffff91706aea89772d3968c5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971be2888be7d1ffff91706a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 27 15:45:44 2021 +0300 msado15: Fix copy-paste typos in IDispatch methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 2 +- dlls/msado15/stream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index aff12f6a108..8c8ec79a58e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -133,7 +133,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Command_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &command->Command_iface, member, flags, params, diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 961aed6a739..424ba722a26 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -113,7 +113,7 @@ static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLEST TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); @@ -133,7 +133,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &stream->Stream_iface, member, flags, params,

1 0

Zhiyi Zhang : comctl32: Remove unnecessary OffsetRect() calls.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: c1395d9255e1a5a9db37c3520fc6d0f7c6563e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1395d9255e1a5a9db37c352… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:10:09 2021 +0800 comctl32: Remove unnecessary OffsetRect() calls. Target rectangles are already offset by previous OffsetRect() calls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a4bca2f9306..05920893c93 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3664,7 +3664,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);

1 0

Zhiyi Zhang : comdlg32: Fix a memory leak.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 665fa81a511f94f97b62f074959e07a25ea7d307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=665fa81a511f94f97b62f074… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:10:02 2021 +0800 comdlg32: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Zhiyi Zhang : user32: Fix memory leaks.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 92a8c691948118906e2604c1f243a5ca6d8c5cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a8c691948118906e2604c1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:09:55 2021 +0800 user32: Fix memory leaks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- dlls/user32/nonclient.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 515341f65ea..4de206aa12f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2633,7 +2633,7 @@ 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); + SetRectRgn(hrgn, 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 );

1 0

Zhiyi Zhang : comctl32: Fix memory leaks.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: a8502312c60fe9fe0bd2aec78553b78325832e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8502312c60fe9fe0bd2aec7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:09:48 2021 +0800 comctl32: Fix memory leaks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 4 +++- dlls/comctl32/listview.c | 1 + dlls/comctl32/treeview.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f84ef1eb168..a4bca2f9306 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2514,7 +2514,7 @@ 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); + SetRectRgn(hrgn, 0, 0, 0, 0); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } @@ -3674,6 +3674,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; }

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-commits March 2021