wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Eric Pouech : dbghelp: Add support for namespace support out of dwarf debug format.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0035d5df3fc1424c126386f0717a233047e5421c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0035d5df3fc1424c126386f07… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:56 2011 +0100 dbghelp: Add support for namespace support out of dwarf debug format. --- dlls/dbghelp/dwarf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c61ec9c..f8eaad4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -192,6 +192,7 @@ typedef struct dwarf2_parse_context_s unsigned long load_offset; unsigned long ref_offset; struct symt* symt_cache[sc_num]; /* void, int1, int2, int4 */ + char* cpp_name; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -945,6 +946,41 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, return NULL; } +static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name) +{ + char* last; + struct attribute diname; + + if (di->abbrev->tag == DW_TAG_compile_unit) return name; + if (!ctx->cpp_name) + ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); + last = ctx->cpp_name + MAX_SYM_NAME - strlen(name); + strcpy(last, name); + for (di = di->parent; di; di = di->parent) + { + switch (di->abbrev->tag) + { + case DW_TAG_namespace: + case DW_TAG_structure_type: + case DW_TAG_class_type: + case DW_TAG_interface_type: + case DW_TAG_union_type: + if (dwarf2_find_attribute(ctx, di, DW_AT_name, &diname)) + { + size_t len = strlen(diname.u.string); + last -= 2 + len; + if (last < ctx->cpp_name) return NULL; + memcpy(last, diname.u.string, len); + last[len] = last[len + 1] = ':'; + } + break; + default: + break; + } + } + return last; +} + /****************************************************************** * dwarf2_read_range * @@ -1331,7 +1367,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; - di->symt = &symt_new_udt(ctx->module, name.u.string, size.u.uvalue, udt)->symt; + di->symt = &symt_new_udt(ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string), + size.u.uvalue, udt)->symt; if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1493,7 +1530,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, ext.u.uvalue = 0; loc.offset += subpgm->ctx->load_offset; symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, - name.u.string, !ext.u.uvalue, + dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; default: @@ -1800,7 +1837,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); if (!is_decl.u.uvalue) { - subpgm.func = symt_new_function(ctx->module, compiland, name.u.string, + subpgm.func = symt_new_function(ctx->module, compiland, + dwarf2_get_cpp_name(ctx, di, name.u.string), ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); di->symt = &subpgm.func->symt; @@ -1921,6 +1959,28 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, return di->symt = &sig_type->symt; } +static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di, + struct symt_compiland* compiland) +{ + if (di->symt) return; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + di->symt = ctx->symt_cache[sc_void]; + if (di->abbrev->have_child) /** any interest to not have child ? */ + { + dwarf2_debug_info_t* child; + unsigned int i; + + for (i = 0; i < vector_length(&di->children); i++) + { + child = *(dwarf2_debug_info_t**)vector_at(&di->children, i); + dwarf2_load_one_entry(ctx, child, compiland); + } + } +} + static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, struct symt_compiland* compiland) @@ -1979,8 +2039,10 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_parse_variable(&subpgm, NULL, di); } break; - /* silence a couple of C++ defines */ case DW_TAG_namespace: + dwarf2_parse_namespace(ctx, di, compiland); + break; + /* silence a couple of C++ defines */ case DW_TAG_imported_module: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: @@ -2234,6 +2296,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, ctx.ref_offset = comp_unit_start - sections[section_debug].address; memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; + ctx.cpp_name = NULL; abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size;

1 0

Eric Pouech : dbghelp: Add hierarchical information in die object.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 770e3b5ddf9e0bdf8b3250fb8a75a1a3e4ac143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=770e3b5ddf9e0bdf8b3250fb8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:47 2011 +0100 dbghelp: Add hierarchical information in die object. --- dlls/dbghelp/dwarf.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7299314..c61ec9c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -154,6 +154,7 @@ typedef struct dwarf2_debug_info_s struct symt* symt; const unsigned char** data; struct vector children; + struct dwarf2_debug_info_s* parent; } dwarf2_debug_info_t; typedef struct dwarf2_section_s @@ -1006,6 +1007,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in */ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* traverse, + dwarf2_debug_info_t* parent_di, dwarf2_debug_info_t** pdi) { const dwarf2_abbrev_entry_t*abbrev; @@ -1036,6 +1038,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, if (!di) return FALSE; di->abbrev = abbrev; di->symt = NULL; + di->parent = parent_di; if (abbrev->num_attr) { @@ -1052,7 +1055,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, vector_init(&di->children, sizeof(dwarf2_debug_info_t*), 16); while (traverse->data < traverse->end_data) { - if (!dwarf2_read_one_debug_info(ctx, traverse, &child)) return FALSE; + if (!dwarf2_read_one_debug_info(ctx, traverse, di, &child)) return FALSE; if (!child) break; where = vector_add(&di->children, &ctx->pool); if (!where) return FALSE; @@ -2238,7 +2241,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); - dwarf2_read_one_debug_info(&ctx, &cu_ctx, &di); + dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di); if (di->abbrev->tag == DW_TAG_compile_unit) {

1 0

Eric Pouech : dbghelp: More precisely manage the inline attribute.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 6d49f958de0de5665c3d9028d53652fa579027ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d49f958de0de5665c3d9028d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:42 2011 +0100 dbghelp: More precisely manage the inline attribute. --- dlls/dbghelp/dwarf.c | 3 ++- dlls/dbghelp/dwarf.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 776031e..7299314 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1764,7 +1764,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* if it's an abstract representation of an inline function, there should be * a concrete object that we'll handle */ - if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags)) + if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags) && + inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n", name.u.string ? name.u.string : "(null)", inline_flags.u.uvalue); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 9864ecc..f0557be 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -475,3 +475,8 @@ enum dwarf_call_frame_info #define DW_EH_PE_aligned 0x50 #define DW_EH_PE_indirect 0x80 #define DW_EH_PE_omit 0xff + +#define DW_INL_not_inlined 0x00 +#define DW_INL_inlined 0x01 +#define DW_INL_declared_not_inlined 0x02 +#define DW_INL_declared_inlined 0x03

1 0

Eric Pouech : dbghelp: When parsing dwarf debug info, silence ptr_to_member and imported_declaration entries.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0816d8f4bfee9d30c45ec0a290f5e1b835b0a5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0816d8f4bfee9d30c45ec0a29… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:36 2011 +0100 dbghelp: When parsing dwarf debug info, silence ptr_to_member and imported_declaration entries. --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 585ea6c..776031e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1358,6 +1358,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_variable: + case DW_TAG_imported_declaration: + case DW_TAG_ptr_to_member_type: /* FIXME: some C++ related stuff */ break; default: @@ -1715,6 +1717,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, * Skip it for now */ break; + case DW_TAG_imported_module: + /* C++ stuff to be silenced (for now) */ + break; case DW_TAG_label: dwarf2_parse_subprogram_label(subpgm, child); break; @@ -1974,6 +1979,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, case DW_TAG_namespace: case DW_TAG_imported_module: case DW_TAG_imported_declaration: + case DW_TAG_ptr_to_member_type: break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %lu\n",

1 0

Alexandre Julliard : ntdll: Fix RtlGetSacl/ DaclSecurityDescriptor for relative descriptors on 64-bit.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: ab7efe727363b52e31ff7a29763a1bcaa623efe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7efe727363b52e31ff7a297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 13:44:11 2011 +0100 ntdll: Fix RtlGetSacl/DaclSecurityDescriptor for relative descriptors on 64-bit. --- dlls/ntdll/sec.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 6784848..c8e8a4d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -604,12 +604,15 @@ NTSTATUS WINAPI RtlGetDaclSecurityDescriptor( if ( (*lpbDaclPresent = (SE_DACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Dacl) - *pDacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Dacl ); - else - *pDacl = lpsd->Dacl; + if (lpsd->Control & SE_SELF_RELATIVE) + { + SECURITY_DESCRIPTOR_RELATIVE *sdr = pSecurityDescriptor; + if (sdr->Dacl) *pDacl = (PACL)SELF_RELATIVE_FIELD( sdr, Dacl ); + else *pDacl = NULL; + } + else *pDacl = lpsd->Dacl; - *lpbDaclDefaulted = (( SE_DACL_DEFAULTED & lpsd->Control ) ? 1 : 0); + *lpbDaclDefaulted = (lpsd->Control & SE_DACL_DEFAULTED) != 0; } else { @@ -673,12 +676,15 @@ NTSTATUS WINAPI RtlGetSaclSecurityDescriptor( if ( (*lpbSaclPresent = (SE_SACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Sacl) - *pSacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Sacl ); - else - *pSacl = lpsd->Sacl; + if (lpsd->Control & SE_SELF_RELATIVE) + { + SECURITY_DESCRIPTOR_RELATIVE *sdr = pSecurityDescriptor; + if (sdr->Sacl) *pSacl = (PACL)SELF_RELATIVE_FIELD( sdr, Sacl ); + else *pSacl = NULL; + } + else *pSacl = lpsd->Sacl; - *lpbSaclDefaulted = (( SE_SACL_DEFAULTED & lpsd->Control ) ? 1 : 0); + *lpbSaclDefaulted = (lpsd->Control & SE_SACL_DEFAULTED) != 0; } return STATUS_SUCCESS; }

1 0

Juan Lang : wininet/tests: Add a couple more tests for GetUrlCacheEntryInfoEx.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: c485996e5ea71f27f2e794461ecfdfe07a9070ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c485996e5ea71f27f2e794461… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 11:34:23 2011 -0800 wininet/tests: Add a couple more tests for GetUrlCacheEntryInfoEx. --- dlls/wininet/tests/urlcache.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 630b5cc..526a70d 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -96,7 +96,7 @@ static void test_find_url_cache_entriesA(void) static void test_GetUrlCacheEntryInfoExA(void) { BOOL ret; - DWORD cbCacheEntryInfo; + DWORD cbCacheEntryInfo, cbRedirectUrl; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; SetLastError(0xdeadbeef); @@ -142,6 +142,16 @@ static void test_GetUrlCacheEntryInfoExA(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + /* Querying the redirect URL fails with ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, NULL, NULL, &cbRedirectUrl, NULL, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, &cbRedirectUrl, NULL, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } static void test_RetrieveUrlCacheEntryA(void)

1 0

Max TenEyck Woodbury : c2man: Fix .spec file flag recognition.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 3d6ae97aa3e607793bca6ab3cef433c9ec00d40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ae97aa3e607793bca6ab3c… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Tue Mar 8 18:29:02 2011 -0500 c2man: Fix .spec file flag recognition. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index db9f25f..868e4fc 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -152,7 +152,7 @@ sub process_spec_file($) { $flags |= $FLAG_REGISTER; } - s/ \-[a-z0-9]+//g; # Strip flags + s/ \-[a-z0-9=_]+//g; # Strip flags if( /^(([0-9]+)|@) / ) {

1 0

Hans Leidekker : msi: Build the key path from the display name if the component is an assembly.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 888a19c02c1c719faba704c00ab24ac11b0dd7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888a19c02c1c719faba704c00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:46 2011 +0100 msi: Build the key path from the display name if the component is an assembly. --- dlls/msi/action.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f58aaf2..7567f5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3252,7 +3252,19 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) squash_guid(comp->ComponentId,squished_cc); msi_free(comp->FullKeypath); - comp->FullKeypath = resolve_keypath( package, comp ); + if (comp->assembly) + { + const WCHAR prefixW[] = {'<','\\',0}; + DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); + + comp->FullKeypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (comp->FullKeypath) + { + strcpyW( comp->FullKeypath, prefixW ); + strcatW( comp->FullKeypath, comp->assembly->display_name ); + } + } + else comp->FullKeypath = resolve_keypath( package, comp ); ACTION_RefCountComponent( package, comp );

1 0

Hans Leidekker : msi: Also register components without a key path.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: e292eb121ddc9da71e758bc41096fa497101e813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292eb121ddc9da71e758bc41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:29 2011 +0100 msi: Also register components without a key path. --- dlls/msi/action.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a003f5e..f58aaf2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3266,15 +3266,10 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (comp->ActionRequest == INSTALLSTATE_LOCAL || comp->ActionRequest == INSTALLSTATE_SOURCE) { - if (!comp->FullKeypath) - continue; - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); else - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, &hkey, TRUE); if (rc != ERROR_SUCCESS) continue;

1 0

Thomas Mullaly : mshtml/tests: Fixed memory leak and made Vtbl's const.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a33df48f36c0b34343d3c369de724dac0fceb943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33df48f36c0b34343d3c369d… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Mar 8 23:27:16 2011 -0500 mshtml/tests: Fixed memory leak and made Vtbl's const. --- dlls/mshtml/tests/events.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index bdb8460..a670532 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1197,7 +1197,7 @@ static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember return S_OK; } -static IDispatchExVtbl timeoutFuncVtbl = { +static const IDispatchExVtbl timeoutFuncVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -1231,7 +1231,7 @@ static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, return S_OK; } -static IDispatchExVtbl div_onclick_dispVtbl = { +static const IDispatchExVtbl div_onclick_dispVtbl = { Dispatch_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -2208,7 +2208,7 @@ static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *ifac return E_NOTIMPL; } -static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_QueryInterface, PropertyNotifySink_AddRef, PropertyNotifySink_Release, @@ -2410,6 +2410,7 @@ static void test_empty_document(void) ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); + IHTMLDocument2_Release(doc); } START_TEST(events)

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
85
Older →

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 2011