ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemdisp: Iterate properties and methods once when collecting supported member names. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-03-02 09:25:03 +03:00 committed by Alexandre Julliard
parent 193d9fcf26
commit 501a99f2a9
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
dlls/wbemdisp/locator.c
View File

@ -1059,50 +1059,52 @@ static HRESULT WINAPI object_GetTypeInfo(
return E_NOTIMPL; return E_NOTIMPL;
} }
static BOOL object_reserve_member( struct object *object, unsigned int count, unsigned int *capacity )
{
unsigned int new_capacity, max_capacity;
struct member *new_members;
if (count <= *capacity)
return TRUE;
max_capacity = ~0u / sizeof(*object->members);
if (count > max_capacity)
return FALSE;
new_capacity = max(4, *capacity);
while (new_capacity < count && new_capacity <= max_capacity / 2)
new_capacity *= 2;
if (new_capacity < count)
new_capacity = max_capacity;
if (!(new_members = heap_realloc( object->members, new_capacity * sizeof(*new_members) )))
return FALSE;
object->members = new_members;
*capacity = new_capacity;
return TRUE;
}
static HRESULT init_members( struct object *object ) static HRESULT init_members( struct object *object )
{ {
IWbemClassObject *sig_in, *sig_out; IWbemClassObject *sig_in, *sig_out;
LONG i = 0, count = 0; unsigned int i, capacity = 0, count = 0;
BSTR name;
HRESULT hr; HRESULT hr;
BSTR name;
if (object->members) return S_OK; if (object->members) return S_OK;
hr = IWbemClassObject_BeginEnumeration( object->object, 0 );
if (SUCCEEDED( hr ))
{
while (IWbemClassObject_Next( object->object, 0, NULL, NULL, NULL, NULL ) == S_OK) count++;
IWbemClassObject_EndEnumeration( object->object );
}
hr = IWbemClassObject_BeginMethodEnumeration( object->object, 0 );
if (SUCCEEDED( hr ))
{
while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK)
{
count++;
SysFreeString( name );
if (sig_in) IWbemClassObject_Release( sig_in );
if (sig_out) IWbemClassObject_Release( sig_out );
}
IWbemClassObject_EndMethodEnumeration( object->object );
}
if (!(object->members = heap_alloc( sizeof(struct member) * count ))) return E_OUTOFMEMORY;
hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); hr = IWbemClassObject_BeginEnumeration( object->object, 0 );
if (SUCCEEDED( hr )) if (SUCCEEDED( hr ))
{ {
while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK)
{ {
object->members[i].name = name; if (!object_reserve_member( object, count + 1, &capacity )) goto error;
object->members[i].is_method = FALSE; object->members[count].name = name;
object->members[i].dispid = 0; object->members[count].is_method = FALSE;
if (++i > count) object->members[count].dispid = 0;
{ count++;
IWbemClassObject_EndEnumeration( object->object );
goto error;
}
TRACE( "added property %s\n", debugstr_w(name) ); TRACE( "added property %s\n", debugstr_w(name) );
} }
IWbemClassObject_EndEnumeration( object->object ); IWbemClassObject_EndEnumeration( object->object );
@ -1113,14 +1115,11 @@ static HRESULT init_members( struct object *object )
{ {
while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK)
{ {
object->members[i].name = name; if (!object_reserve_member( object, count + 1, &capacity )) goto error;
object->members[i].is_method = TRUE; object->members[count].name = name;
object->members[i].dispid = 0; object->members[count].is_method = TRUE;
if (++i > count) object->members[count].dispid = 0;
{ count++;
IWbemClassObject_EndMethodEnumeration( object->object );
goto error;
}
if (sig_in) IWbemClassObject_Release( sig_in ); if (sig_in) IWbemClassObject_Release( sig_in );
if (sig_out) IWbemClassObject_Release( sig_out ); if (sig_out) IWbemClassObject_Release( sig_out );
TRACE( "added method %s\n", debugstr_w(name) ); TRACE( "added method %s\n", debugstr_w(name) );
@ -1133,7 +1132,8 @@ static HRESULT init_members( struct object *object )
return S_OK; return S_OK;
error: error:
for (--i; i >= 0; i--) SysFreeString( object->members[i].name ); for (i = 0; i < count; ++i)
SysFreeString( object->members[i].name );
heap_free( object->members ); heap_free( object->members );
object->members = NULL; object->members = NULL;
object->nb_members = 0; object->nb_members = 0;