March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : wbemprox: Implement SetStringValue() method.
by Alexandre Julliard March 1, 2021

March 1, 2021

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

Zhiyi Zhang : comctl32: Fix memory leaks.
by Alexandre Julliard March 1, 2021

March 1, 2021

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

Nikolay Sivov : oleaut32: Fix VariantCopy()/VariantCopyInd() prototypes.
by Alexandre Julliard March 1, 2021

March 1, 2021

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 : oleaut32: Fix VariantChangeType()/VariantChangeTypeEx() prototypes.
by Alexandre Julliard March 1, 2021

March 1, 2021

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 : wbemdisp: Forward ExecMethod_() to Services object.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: c86ad936d05a2b53ac33ee2728807c9edc4216b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c86ad936d05a2b53ac33ee27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 10:18:31 2021 +0300 wbemdisp: Forward ExecMethod_() to Services object. 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/wbemdisp/locator.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 9e191c07b49..926a4e88e63 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1414,14 +1414,36 @@ static HRESULT WINAPI object_ReferencesAsync_( static HRESULT WINAPI object_ExecMethod_( ISWbemObject *iface, - BSTR strMethodName, - IDispatch *objWbemInParameters, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObject **objWbemOutParameters ) + BSTR method, + IDispatch *in_params, + LONG flags, + IDispatch *valueset, + ISWbemObject **out_params ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + VARIANT path; + HRESULT hr; + + TRACE( "%p, %s, %p, %#x, %p, %p\n", object, debugstr_w(method), in_params, flags, valueset, out_params ); + + V_VT( &path ) = VT_EMPTY; + hr = IWbemClassObject_Get( object->object, L"__PATH", 0, &path, NULL, NULL ); + if (SUCCEEDED(hr)) + { + if (V_VT( &path ) != VT_BSTR) + { + WARN( "Unexpected object path value type.\n" ); + VariantClear( &path ); + return E_UNEXPECTED; + } + + hr = ISWbemServices_ExecMethod( &object->services->ISWbemServices_iface, V_BSTR( &path ), method, + in_params, flags, valueset, out_params ); + + VariantClear( &path ); + } + + return hr; } static HRESULT WINAPI object_ExecMethodAsync_(

1 0

Floris Renaud : shell32: Resize Run program window.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 96a62aa61de4b809ae3ed01bf0baed0f40de4d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96a62aa61de4b809ae3ed01b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sun Feb 28 23:28:26 2021 +0100 shell32: Resize Run program window. Three lines of text will now fit in the window. More translations will fit. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f19b09f8c21..ff859381593 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -334,7 +334,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", IDC_RUNDLG_DESCRIPTION, 45, 8, 194, 28 LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 35, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 45, 37, 185, 100 DEFPUSHBUTTON "OK", IDOK, 72, 63, 50, 14, WS_TABSTOP

1 0

Nikolay Sivov : wbemprox: Implement SetDWORDValue() method.
by Alexandre Julliard March 1, 2021

March 1, 2021

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 : wbemdisp: Partially implement ExecMethod().
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 33e123db37d4ca7ad834f9a96990123189184ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e123db37d4ca7ad834f9a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 10:18:32 2021 +0300 wbemdisp: Partially implement ExecMethod(). 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/wbemdisp/locator.c | 50 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 926a4e88e63..867a19c1ab2 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1590,6 +1590,18 @@ static const ISWbemObjectVtbl object_vtbl = object_get_Security_ }; +static struct object *unsafe_object_impl_from_IDispatch(IDispatch *iface) +{ + if (!iface) + return NULL; + if (iface->lpVtbl != (IDispatchVtbl *)&object_vtbl) + { + FIXME( "External implementations are not supported.\n" ); + return NULL; + } + return CONTAINING_RECORD(iface, struct object, ISWbemObject_iface); +} + static HRESULT SWbemObject_create( struct services *services, IWbemClassObject *wbem_object, ISWbemObject **obj ) { @@ -2412,15 +2424,37 @@ static HRESULT WINAPI services_ExecNotificationQueryAsync( static HRESULT WINAPI services_ExecMethod( ISWbemServices *iface, - BSTR strObjectPath, - BSTR strMethodName, - IDispatch *objWbemInParameters, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObject **objWbemOutParameters ) + BSTR path, + BSTR method, + IDispatch *in_sparams, + LONG flags, + IDispatch *valueset, + ISWbemObject **out_sparams ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct services *services = impl_from_ISWbemServices( iface ); + IWbemClassObject *out_params = NULL; + struct object *in_params; + HRESULT hr; + + TRACE( "%p, %s, %s, %p, %#x, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, + flags, valueset, out_sparams ); + + in_params = unsafe_object_impl_from_IDispatch( in_sparams ); + out_params = NULL; + + if (valueset) + FIXME("Named value set is unused\n"); + + hr = IWbemServices_ExecMethod( services->services, path, method, flags, NULL, in_params ? in_params->object : NULL, + out_sparams ? &out_params : NULL, NULL ); + + if (SUCCEEDED(hr) && out_params) + { + hr = SWbemObject_create( services, out_params, out_sparams ); + IWbemClassObject_Release( out_params ); + } + + return hr; } static HRESULT WINAPI services_ExecMethodAsync(

1 0

Nikolay Sivov : wbemdisp: Reference Services object in objects it's created.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 2a7f02bc41679901ba95dd7daa7aef6c8a46deaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a7f02bc41679901ba95dd7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 10:18:30 2021 +0300 wbemdisp: Reference Services object in objects it's created. 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/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 );

1 0

Nikolay Sivov : wbemprox: Implement DeleteKey() method.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 76f90ab6dfd525a42fa99a5e5be98397fe553550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f90ab6dfd525a42fa99a5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 10:14:46 2021 +0300 wbemprox: Implement DeleteKey() 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 | 6 +++++ dlls/wbemprox/reg.c | 54 ++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 61 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1a98b16b22c..ddec2a0daf8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -395,6 +395,7 @@ static const struct column col_stdregprov[] = { L"GetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetDWORDValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"DeleteKey", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_systemenclosure[] = { @@ -806,6 +807,7 @@ struct record_stdregprov class_method *getstringvalue; class_method *setstringvalue; class_method *setdwordvalue; + class_method *deletekey; }; struct record_sysrestore { @@ -912,6 +914,9 @@ static const struct record_param data_param[] = { 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"StdRegProv", L"DeleteKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"DeleteKey", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"DeleteKey", -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 }, @@ -951,6 +956,7 @@ static const struct record_stdregprov data_stdregprov[] = reg_get_stringvalue, reg_set_stringvalue, reg_set_dwordvalue, + reg_delete_key, } }; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 2fb12d9c28c..f021aa14af8 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -568,3 +568,57 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemCl if (out_params) IWbemClassObject_Release( out_params ); return hr; } + +static void delete_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) +{ + LONG res; + + TRACE("%p, %s\n", root, debugstr_w(subkey)); + + res = RegDeleteKeyExW( root, subkey, 0, 0 ); + set_variant( VT_UI4, res, NULL, retval ); +} + +HRESULT reg_delete_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT defkey, subkey, 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 = create_signature( L"StdRegProv", L"DeleteKey", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &subkey ); + IWbemClassObject_Release( sig ); + return hr; + } + } + delete_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); + if (out_params) + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + + 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 76ef479c3ef..bae4b5d20c5 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -250,6 +250,7 @@ HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject 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 reg_delete_key(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