April 2014 - Wine-commits - list.winehq.org

Hans Leidekker : wbemprox: Return selected properties only from IWbemClassObject::GetNames.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: c9abb27d89b7a531c0a873264cc0ac3eb04ff624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9abb27d89b7a531c0a873264… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:18:39 2014 +0200 wbemprox: Return selected properties only from IWbemClassObject::GetNames. --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index fdfcc16..e4c4fcd 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -964,7 +964,7 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) SAFEARRAY *sa; BSTR str; LONG i; - UINT num_props = count_properties( view ); + UINT num_props = count_selected_properties( view ); if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; @@ -973,6 +973,7 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) BOOL is_system; if (is_method( view->table, i )) continue; + if (!is_selected_prop( view, view->table->columns[i].name )) continue; is_system = is_system_prop( view->table->columns[i].name ); if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue;

1 0

Hans Leidekker : wbemprox: Return selected properties only from IWbemClassObject::Next.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 8343aed4c299b691d76b2c6f3554cd98b6ee2ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8343aed4c299b691d76b2c6f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:19:30 2014 +0200 wbemprox: Return selected properties only from IWbemClassObject::Next. --- dlls/wbemprox/class.c | 29 ++++++++++++++++++----------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/table.c | 25 ------------------------- dlls/wbemprox/wbemprox_private.h | 3 ++- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5a9e2e4..afb9f8c 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -511,23 +511,30 @@ static HRESULT WINAPI class_object_Next( CIMTYPE *pType, LONG *plFlavor ) { - struct class_object *co = impl_from_IWbemClassObject( iface ); - struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; - BSTR property; + struct class_object *obj = impl_from_IWbemClassObject( iface ); + struct enum_class_object *iter = impl_from_IEnumWbemClassObject( obj->iter ); + struct view *view = iter->query->view; + BSTR prop; HRESULT hr; + UINT i; TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); - if (!(property = get_property_name( co->name, co->index_property ))) return WBEM_S_NO_MORE_DATA; - if ((hr = get_propval( view, co->index, property, pVal, pType, plFlavor ) != S_OK)) + for (i = obj->index_property; i < view->table->num_cols; i++) { - SysFreeString( property ); - return hr; + if (is_method( view->table, i )) continue; + if (!is_selected_prop( view, view->table->columns[i].name )) continue; + if (!(prop = SysAllocString( view->table->columns[i].name ))) return E_OUTOFMEMORY; + if ((hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor )) != S_OK) + { + SysFreeString( prop ); + return hr; + } + obj->index_property = i + 1; + *strName = prop; + return S_OK; } - *strName = property; - co->index_property++; - return S_OK; + return WBEM_S_NO_MORE_DATA; } static HRESULT WINAPI class_object_EndEnumeration( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index e4c4fcd..c97b52b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -424,7 +424,7 @@ done: return hr; } -static BOOL is_selected_prop( const struct view *view, const WCHAR *name ) +BOOL is_selected_prop( const struct view *view, const WCHAR *name ) { const struct property *prop = view->proplist; @@ -563,7 +563,7 @@ done: return ret; } -static inline BOOL is_method( const struct table *table, UINT column ) +BOOL is_method( const struct table *table, UINT column ) { return table->columns[column].type & COL_FLAG_METHOD; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index bbd3f5e..7a5b1c1 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -406,28 +406,3 @@ BSTR get_method_name( const WCHAR *class, UINT index ) release_table( table ); return NULL; } - -BSTR get_property_name( const WCHAR *class, UINT index ) -{ - struct table *table; - UINT i, count = 0; - BSTR ret; - - if (!(table = grab_table( class ))) return NULL; - - for (i = 0; i < table->num_cols; i++) - { - if (!(table->columns[i].type & COL_FLAG_METHOD)) - { - if (index == count) - { - ret = SysAllocString( table->columns[i].name ); - release_table( table ); - return ret; - } - count++; - } - } - release_table( table ); - return NULL; -} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index c047ac1..0eeb0c7 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -192,6 +192,7 @@ HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; HRESULT set_value( const struct table *, UINT, UINT, LONGLONG, CIMTYPE ) DECLSPEC_HIDDEN; +BOOL is_method( const struct table *, UINT ) DECLSPEC_HIDDEN; HRESULT get_method( const struct table *, const WCHAR *, class_method ** ) DECLSPEC_HIDDEN; HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; @@ -200,10 +201,10 @@ HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; +BOOL is_selected_prop( const struct view *, const WCHAR * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; -BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.CurrentClockSpeed.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: ed1f005e14b78aaacb4012d13ba1f7b450cc5616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1f005e14b78aaacb4012d13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:20:05 2014 +0200 wbemprox: Implement Win32_Processor.CurrentClockSpeed. --- dlls/wbemprox/builtin.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8f4b362..1ca4137 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -129,6 +129,8 @@ static const WCHAR prop_csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR prop_currentbitsperpixelW[] = {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; +static const WCHAR prop_currentclockspeedW[] = + {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_currentverticalresW[] = @@ -440,6 +442,7 @@ static const struct column col_processor[] = { { prop_addresswidthW, CIM_UINT16, VT_I4 }, { prop_cpustatusW, CIM_UINT16 }, + { prop_currentclockspeedW, CIM_UINT32, VT_I4 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_familyW, CIM_UINT16, VT_I4 }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -746,6 +749,7 @@ struct record_processor { UINT16 addresswidth; UINT16 cpu_status; + UINT32 currentclockspeed; const WCHAR *device_id; UINT16 family; const WCHAR *manufacturer; @@ -1959,7 +1963,7 @@ static void get_processor_name( WCHAR *name ) regs_to_str( regs, 16, name + 32 ); } } -static UINT get_processor_maxclockspeed( void ) +static UINT get_processor_currentclockspeed( UINT index ) { PROCESSOR_POWER_INFORMATION *info; UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); @@ -1968,7 +1972,21 @@ static UINT get_processor_maxclockspeed( void ) if ((info = heap_alloc( size ))) { status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); - if (!status) ret = info[0].MaxMhz; + if (!status) ret = info[index].CurrentMhz; + heap_free( info ); + } + return ret; +} +static UINT get_processor_maxclockspeed( UINT index ) +{ + PROCESSOR_POWER_INFORMATION *info; + UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + NTSTATUS status; + + if ((info = heap_alloc( size ))) + { + status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); + if (!status) ret = info[index].MaxMhz; heap_free( info ); } return ret; @@ -1986,7 +2004,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, maxclockspeed, num_cores, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -1995,7 +2013,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * get_processor_manufacturer( manufacturer ); get_processor_name( name ); - maxclockspeed = get_processor_maxclockspeed(); num_logical_processors = get_logical_processor_count( &num_cores ) / count; num_cores /= count; @@ -2004,11 +2021,12 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec = (struct record_processor *)(table->data + offset); rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; rec->cpu_status = 1; /* CPU Enabled */ + rec->currentclockspeed = get_processor_currentclockspeed( i ); sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->family = 2; /* Unknown */ rec->manufacturer = heap_strdupW( manufacturer ); - rec->maxclockspeed = maxclockspeed; + rec->maxclockspeed = get_processor_maxclockspeed( i ); rec->name = heap_strdupW( name ); rec->num_cores = num_cores; rec->num_logical_processors = num_logical_processors;

1 0

Hans Leidekker : wmiutils: Fix a memory leak (valgrind).
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 582c5fde998096b4726407356fc8064ea4e382c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582c5fde998096b4726407356… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:21:06 2014 +0200 wmiutils: Fix a memory leak (valgrind). --- dlls/wmiutils/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 647724f..b2b4945 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -313,8 +313,11 @@ static void init_path( struct path *path ) static void clear_path( struct path *path ) { + unsigned int i; + heap_free( path->text ); heap_free( path->server ); + for (i = 0; i < path->num_namespaces; i++) heap_free( path->namespaces[i] ); heap_free( path->namespaces ); heap_free( path->len_namespaces ); heap_free( path->class );

1 0

Hans Leidekker : msi/tests: Fix a couple of memory leaks (valgrind).
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 4c8edb1b4c25cffeaa1573f431e9931c1fc87042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8edb1b4c25cffeaa1573f43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:21:42 2014 +0200 msi/tests: Fix a couple of memory leaks (valgrind). --- dlls/msi/tests/action.c | 8 +++++--- dlls/msi/tests/automation.c | 8 +++++--- dlls/msi/tests/install.c | 8 +++++--- dlls/msi/tests/msi.c | 8 +++++--- dlls/msi/tests/package.c | 8 +++++--- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 047854b..9f1651d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2255,20 +2255,22 @@ static void init_functionpointers(void) static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 242ec63..beed6fd 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -230,20 +230,22 @@ static void init_functionpointers(void) static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 603042a..2a9af85 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2043,20 +2043,22 @@ static void init_functionpointers(void) static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1d63df5..3897c24 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -175,20 +175,22 @@ static BOOL delete_pf(const char *rel_path, BOOL is_file) static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d5c37ea..a0c0455 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -88,20 +88,22 @@ static void init_functionpointers(void) static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { if (!AllocateAndInitializeSid(&NtAuthority, 2,

1 0

Jacek Caban : vbscript: Allow property getters to take arguments.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 0f50cb323efb3ee3910421eaac26950b15653c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f50cb323efb3ee3910421eaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 11:31:30 2014 +0200 vbscript: Allow property getters to take arguments. --- dlls/vbscript/parser.y | 4 ++-- dlls/vbscript/tests/lang.vbs | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 6bd4907..c5d1c59 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -403,8 +403,8 @@ ClassBody | PropertyDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier EmptyBrackets_opt tNL StatementsNl_opt tEND tPROPERTY - { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, NULL, $7); CHECK_ERROR; } + : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tPROPERTY + { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' tNL StatementsNl_opt tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' tNL StatementsNl_opt tEND tPROPERTY diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d3e8318..c24ffa6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -849,6 +849,10 @@ Class TestClass Call ok(getVT(publicProp2) = "VT_I2*", "getVT(publicProp2) = " & getVT(publicProp2)) Call ok(getVT(Me.publicProp2) = "VT_I2", "getVT(Me.publicProp2) = " & getVT(Me.publicProp2)) End Sub + + Property Get gsGetProp(x) + gsGetProp = x + End Property End Class Call testDisp(new testClass) @@ -916,6 +920,29 @@ Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) Call (New testclass).publicSub() Call (New testclass).publicSub +class PropTest + property get prop0() + prop0 = 1 + end property + + property get prop1(x) + prop1 = x+1 + end property + + property get prop2(x, y) + prop2 = x+y + end property +end class + +set obj = new PropTest + +call ok(obj.prop0 = 1, "obj.prop0 = " & obj.prop0) +call ok(obj.prop1(3) = 4, "obj.prop1(3) = " & obj.prop1(3)) +call ok(obj.prop2(3,4) = 7, "obj.prop2(3,4) = " & obj.prop2(3,4)) +call obj.prop0() +call obj.prop1(2) +call obj.prop2(3,4) + x = "following ':' is correct syntax" : x = "following ':' is correct syntax" :: : :: x = "also correct syntax"

1 0

Jacek Caban : vbscript: Added InvokeEx(DISPATCH_PROPERTYGET) implementation.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: b4d30e92c91febe8658e8b5a18a34cd64570b38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d30e92c91febe8658e8b5a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 11:31:56 2014 +0200 vbscript: Added InvokeEx(DISPATCH_PROPERTYGET) implementation. --- dlls/vbscript/tests/run.c | 36 +++++++++++++++++++++++++++++++++++- dlls/vbscript/vbdisp.c | 9 +++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index fe611ff..53ead45 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -244,7 +244,7 @@ static IServiceProvider caller_sp = { &ServiceProviderVtbl }; static void test_disp(IDispatch *disp) { - DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id; + DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id, gs_getter_id; DISPID named_args[5] = {DISPID_PROPERTYPUT}; VARIANT v, args[5]; DISPPARAMS dp = {args, named_args}; @@ -443,6 +443,40 @@ static void test_disp(IDispatch *disp) ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); ok(id == public_prop_id, "id = %d, expected %d\n", id, public_prop_id); + str = a2bstr("gsGetProp"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &gs_getter_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicFunction) failed: %08x\n", hres); + ok(gs_getter_id != -1, "gs_getter_id = -1\n"); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + dp.cNamedArgs = 0; + dp.cArgs = 1; + V_VT(&v) = VT_I8; + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && V_BOOL(&v), "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_PROPERTYGET, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_FALSE; + dp.cArgs = 1; + V_VT(&v) = VT_I8; + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && !V_BOOL(&v), "V_VT(v) = %d\n", V_VT(&v)); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + V_VT(&v) = VT_I8; + dp.cArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, gs_getter_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && V_BOOL(&v), "V_VT(v) = %d\n", V_VT(&v)); + IDispatchEx_Release(dispex); } diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index e8fb107..99f975a 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -391,6 +391,15 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc function_t *func; switch(wFlags) { + case DISPATCH_PROPERTYGET: + func = This->desc->funcs[id].entries[VBDISP_CALLGET]; + if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + WARN("no getter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, func, This, pdp, pvarRes); + case DISPATCH_METHOD: case DISPATCH_METHOD|DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET];

1 0

Piotr Caban : msvcrt: Handle seh exception rethrowing in catch_function_nested_handler.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: b5b454c5046fffdfbdb0923b530f1afbadc5ff2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b454c5046fffdfbdb0923b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 30 13:50:25 2014 +0200 msvcrt: Handle seh exception rethrowing in catch_function_nested_handler. --- dlls/msvcrt/except_i386.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 0481282..7f521cc 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -374,23 +374,28 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG { PEXCEPTION_RECORD prev_rec = nested_frame->rec; if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || - (rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && + (prev_rec->ExceptionCode == CXX_EXCEPTION && + rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2])) { /* exception was rethrown */ - rec->ExceptionInformation[1] = prev_rec->ExceptionInformation[1]; - rec->ExceptionInformation[2] = prev_rec->ExceptionInformation[2]; - TRACE("detect rethrow: re-propagate: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + *rec = *prev_rec; + rec->ExceptionFlags &= ~EH_UNWINDING; + if(TRACE_ON(seh)) { + TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + if(rec->ExceptionCode == CXX_EXCEPTION) + TRACE("re-propage: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + } } - else if (nested_frame->prev_rec && + else if (nested_frame->prev_rec && nested_frame->prev_rec->ExceptionCode == CXX_EXCEPTION && nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) { TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); } - else { + else if (prev_rec->ExceptionCode == CXX_EXCEPTION) { /* new exception in exception handler, destroy old */ void *object = (void*)prev_rec->ExceptionInformation[1]; cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; @@ -399,6 +404,10 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(info && info->destructor) call_dtor( info->destructor, object ); } + else + { + TRACE("detect threw new exception in catch block\n"); + } } return cxx_frame_handler( rec, nested_frame->cxx_frame, context,

1 0

Piotr Caban : msvcrt: Handle seh exceptions rethrowing in cxx_frame_handler.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 36309142d0ed5755a7e6b8c80a973e56c88320d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36309142d0ed5755a7e6b8c80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 30 13:51:35 2014 +0200 msvcrt: Handle seh exceptions rethrowing in cxx_frame_handler. --- dlls/msvcrt/except_i386.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 7f521cc..2a4ef9d 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -522,17 +522,21 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } if (!descr->tryblock_count) return ExceptionContinueSearch; - if(rec->ExceptionCode == CXX_EXCEPTION) + if(rec->ExceptionCode == CXX_EXCEPTION && + rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) { - if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - EXCEPTION_RECORD *exc_record = msvcrt_get_thread_data()->exc_record; - rec->ExceptionInformation[1] = exc_record->ExceptionInformation[1]; - rec->ExceptionInformation[2] = exc_record->ExceptionInformation[2]; - TRACE("detect rethrow: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + *rec = *msvcrt_get_thread_data()->exc_record; + rec->ExceptionFlags &= ~EH_UNWINDING; + if(TRACE_ON(seh)) { + TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + if(rec->ExceptionCode == CXX_EXCEPTION) + TRACE("re-propage: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } + } + if(rec->ExceptionCode == CXX_EXCEPTION) + { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 &&

1 0

Victor Martinez Calvo : dbghelp: Fix invalid assignment in symt_fill_sym_info.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 9eca0aa8a7d099fd4866d8f4764e39ab7be4cd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eca0aa8a7d099fd4866d8f47… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Tue Apr 29 17:39:46 2014 +0200 dbghelp: Fix invalid assignment in symt_fill_sym_info. --- dlls/dbghelp/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index a82d1df..3e7877a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -696,8 +696,8 @@ static void symt_fill_sym_info(struct module_pair* pair, if (sym_info->MaxNameLen) { if (sym->tag != SymTagPublicSymbol || !(dbghelp_options & SYMOPT_UNDNAME) || - (sym_info->NameLen = UnDecorateSymbolName(name, sym_info->Name, - sym_info->MaxNameLen, UNDNAME_NAME_ONLY) == 0)) + ((sym_info->NameLen = UnDecorateSymbolName(name, sym_info->Name, + sym_info->MaxNameLen, UNDNAME_NAME_ONLY)) == 0)) { sym_info->NameLen = min(strlen(name), sym_info->MaxNameLen - 1); memcpy(sym_info->Name, name, sym_info->NameLen);

1 0