wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : widl: Generate a registration script along with the typelib when creating a resource file .
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 4ff0faa67cbc150b1031af927f919c0e438968df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff0faa67cbc150b1031af927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:15:55 2011 +0200 widl: Generate a registration script along with the typelib when creating a resource file. --- dlls/stdole32.tlb/std_ole_v1.idl | 1 + tools/widl/register.c | 114 ++++++++++++++++++++++++++++++-------- tools/widl/widl.h | 1 + tools/widl/write_msft.c | 1 + tools/wine.inf.in | 15 ----- 5 files changed, 94 insertions(+), 38 deletions(-) diff --git a/dlls/stdole32.tlb/std_ole_v1.idl b/dlls/stdole32.tlb/std_ole_v1.idl index bf9cb7e..45fb3d5 100644 --- a/dlls/stdole32.tlb/std_ole_v1.idl +++ b/dlls/stdole32.tlb/std_ole_v1.idl @@ -20,6 +20,7 @@ [ uuid(00020430-0000-0000-C000-000000000046), + restricted, version(1.0), helpstring("OLE Automation") ] diff --git a/tools/widl/register.c b/tools/widl/register.c index ec573be..c75a6ac 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -77,40 +77,72 @@ static const type_t *find_ps_factory( const statement_list_t *stmts ) return NULL; } -static int write_interface( const type_t *iface, const type_t *ps_factory ) +static void write_interface( const type_t *iface, const type_t *ps_factory ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); const UUID *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); - if (!uuid) return 0; - if (!is_object( iface )) return 0; + if (!uuid) return; + if (!is_object( iface )) return; if (!type_iface_get_inherit(iface)) /* special case for IUnknown */ { - put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), iface->name ); - return 0; + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + return; } - if (is_local( iface->attrs )) return 0; - put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + if (is_local( iface->attrs )) return; + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); put_str( indent, "{\n" ); indent++; put_str( indent, "NumMethods = s %u\n", count_methods( iface )); put_str( indent, "ProxyStubClsid32 = s '%s'\n", format_uuid( ps_uuid )); indent--; put_str( indent, "}\n" ); - return 1; } -static int write_interfaces( const statement_list_t *stmts, const type_t *ps_factory ) +static void write_interfaces( const statement_list_t *stmts, const type_t *ps_factory ) { const statement_t *stmt; - int count = 0; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) - count += write_interface( stmt->u.type, ps_factory ); + write_interface( stmt->u.type, ps_factory ); + } +} + +static void write_typelib_interface( const type_t *iface, const typelib_t *typelib ) +{ + const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); + unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + + if (!uuid) return; + if (!is_object( iface )) return; + if (!is_attr( iface->attrs, ATTR_OLEAUTOMATION ) && !is_attr( iface->attrs, ATTR_DISPINTERFACE )) + return; + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + put_str( indent, "{\n" ); + indent++; + put_str( indent, "ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'\n" ); + put_str( indent, "ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'\n" ); + if (version) + put_str( indent, "TypeLib = s '%s' { val Version = s '%u.%u' }\n", + format_uuid( typelib_uuid ), MAJORVERSION(version), MINORVERSION(version) ); + else + put_str( indent, "TypeLib = s '%s'", format_uuid( typelib_uuid )); + indent--; + put_str( indent, "}\n" ); +} + +static void write_typelib_interfaces( const typelib_t *typelib ) +{ + const statement_t *stmt; + + if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) + write_typelib_interface( stmt->u.type, typelib ); } - return count; } static int write_coclass( const type_t *class, const typelib_t *typelib ) @@ -123,10 +155,10 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) unsigned int version = get_attrv( class->attrs, ATTR_VERSION ); if (!uuid) return 0; - if (typelib && !threading) return 0; + if (typelib && !threading && !progid) return 0; if (!descr) descr = class->name; - put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), descr ); + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), descr ); put_str( indent++, "{\n" ); if (threading) put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s '%s' }\n", threading ); @@ -154,11 +186,6 @@ static void write_coclasses( const statement_list_t *stmts, const typelib_t *typ const type_t *type = stmt->u.type; if (type_get_type(type) == TYPE_COCLASS) write_coclass( type, typelib ); } - else if (stmt->type == STMT_LIBRARY) - { - const typelib_t *lib = stmt->u.lib; - write_coclasses( lib->stmts, lib ); - } } } @@ -201,10 +228,6 @@ static void write_progids( const statement_list_t *stmts ) const type_t *type = stmt->u.type; if (type_get_type(type) == TYPE_COCLASS) write_progid( type ); } - else if (stmt->type == STMT_LIBRARY) - { - write_progids( stmt->u.lib->stmts ); - } } } @@ -249,3 +272,48 @@ void write_regscript( const statement_list_t *stmts ) error( "Failed to write to %s\n", regscript_name ); } } + +void output_typelib_regscript( const typelib_t *typelib ) +{ + const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const char *descr = get_attrp( typelib->attrs, ATTR_HELPSTRING ); + const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); + unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + unsigned int flags = 0; + + if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ + if (is_attr( typelib->attrs, ATTR_CONTROL )) flags |= 2; /* LIBFLAG_FCONTROL */ + if (is_attr( typelib->attrs, ATTR_HIDDEN )) flags |= 4; /* LIBFLAG_FHIDDEN */ + + put_str( indent, "HKCR\n" ); + put_str( indent++, "{\n" ); + + put_str( indent, "NoRemove Typelib\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove '%s'\n", format_uuid( typelib_uuid )); + put_str( indent++, "{\n" ); + put_str( indent, "'%u.%u' = s '%s'\n", + MAJORVERSION(version), MINORVERSION(version), descr ? descr : typelib->name ); + put_str( indent++, "{\n" ); + put_str( indent, "'%x' { %s = s '%%MODULE%%' }\n", + lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32" ); + put_str( indent, "FLAGS = s '%u'\n", flags ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + + put_str( indent, "NoRemove Interface\n" ); + put_str( indent++, "{\n" ); + write_typelib_interfaces( typelib ); + put_str( --indent, "}\n" ); + + put_str( indent, "NoRemove CLSID\n" ); + put_str( indent++, "{\n" ); + write_coclasses( typelib->stmts, typelib ); + put_str( --indent, "}\n" ); + + write_progids( typelib->stmts ); + put_str( --indent, "}\n" ); + + add_output_to_resources( "WINE_REGISTRY", typelib_name ); +} diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 20be1f3..6551fa0 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -86,6 +86,7 @@ extern void write_proxies(const statement_list_t *stmts); extern void write_client(const statement_list_t *stmts); extern void write_server(const statement_list_t *stmts); extern void write_regscript(const statement_list_t *stmts); +extern void output_typelib_regscript( const typelib_t *typelib ); extern void write_local_stubs(const statement_list_t *stmts); extern void write_dlldata(const statement_list_t *stmts); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 66da286..416f81d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2546,6 +2546,7 @@ static void save_all_changes(msft_typelib_t *typelib) if (strendswith( typelib_name, ".res" )) /* create a binary resource file */ { add_output_to_resources( "TYPELIB", "#1" ); + output_typelib_regscript( typelib->typelib ); flush_output_resources( typelib_name ); } else flush_output_buffer( typelib_name ); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cfefbe4..af68d8f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -231,9 +231,6 @@ HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" -; FIXME: the following should be done by the dll registration -HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\0\win16,,,"stdole.tlb" -HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\FLAGS,,,"1" HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932 HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"InternetEncoding",0x10003,50221 @@ -2496,19 +2493,9 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1 -11,,gameux.dll,1 -11,,hhctrl.ocx,1 -11,,ieframe.dll,1 -11,,jscript.dll,1 11,,mshtml.dll,1 -11,,msi.dll,1 11,,msiexec.exe,1 11,,msisip.dll,1 -11,,msxml.dll,1 -11,,msxml2.dll,1 -11,,msxml3.dll,1 -11,,msxml4.dll,1 -11,,msxml6.dll,1 11,,qcap.dll,1 11,,qmgr.dll,1 11,,quartz.dll,1 @@ -2517,9 +2504,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 -11,,winhttp.dll,1 11,,wintrust.dll,1 -11,,wuapi.dll,1 11,,iexplore.exe,1 ; 32bit-only fake dlls

1 0

Alexandre Julliard : setupapi: Run registration scripts of fake dlls as they are copied.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 5ec4e8f192a3642d9b982f24392e303ef1e63957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec4e8f192a3642d9b982f243… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 13:47:43 2011 +0200 setupapi: Run registration scripts of fake dlls as they are copied. --- dlls/setupapi/fakedll.c | 74 +++++++++++++++++++++++++++++++++++++++++++++- tools/wine.inf.in | 63 +++++++++------------------------------- 2 files changed, 86 insertions(+), 51 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 27d4b8a..0c39935 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -33,6 +33,8 @@ # include <unistd.h> #endif +#define COBJMACROS +#define ATL_INITGUID #define NONAMELESSSTRUCT #define NONAMELESSUNION #include "ntstatus.h" @@ -45,6 +47,8 @@ #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" +#include "ole2.h" +#include "atliface.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -59,6 +63,7 @@ static SIZE_T file_buffer_size; static unsigned int handled_count; static unsigned int handled_total; static char **handled_dlls; +static IRegistrar *registrar; struct dll_info { @@ -465,6 +470,67 @@ static HANDLE create_dest_file( const WCHAR *name ) return h; } +static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg ) +{ + HRESULT *hr = (HRESULT *)arg; + WCHAR *buffer; + HRSRC rsrc = FindResourceW( module, name, type ); + char *str = LoadResource( module, rsrc ); + DWORD lenW, lenA = SizeofResource( module, rsrc ); + + if (!str) return FALSE; + lenW = MultiByteToWideChar( CP_UTF8, 0, str, lenA, NULL, 0 ) + 1; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_UTF8, 0, str, lenA, buffer, lenW ); + buffer[lenW - 1] = 0; + *hr = IRegistrar_StringRegister( registrar, buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + return TRUE; +} + +static void register_fake_dll( const WCHAR *name, const void *data, size_t size ) +{ + static const WCHAR atlW[] = {'a','t','l','.','d','l','l',0}; + static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; + static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; + const IMAGE_RESOURCE_DIRECTORY *resdir; + LDR_RESOURCE_INFO info; + HRESULT hr = S_OK; + HMODULE module = (HMODULE)((ULONG_PTR)data | 1); + + info.Type = (ULONG_PTR)regtypeW; + if (LdrFindResourceDirectory_U( module, &info, 1, &resdir )) return; + + if (!registrar) + { + /* create the object by hand since we can't guarantee that atl and ole32 are registered */ + IClassFactory *cf; + HRESULT (WINAPI *pDllGetClassObject)( REFCLSID clsid, REFIID iid, LPVOID *ppv ); + HMODULE atl = LoadLibraryW( atlW ); + + if ((pDllGetClassObject = (void *)GetProcAddress( atl, "DllGetClassObject" ))) + { + hr = pDllGetClassObject( &CLSID_Registrar, &IID_IClassFactory, (void **)&cf ); + if (SUCCEEDED( hr )) + { + hr = IClassFactory_CreateInstance( cf, NULL, &IID_IRegistrar, (void **)&registrar ); + IClassFactory_Release( cf ); + } + } + if (!registrar) + { + ERR( "failed to create IRegistrar: %x\n", hr ); + return; + } + } + + TRACE( "registering %s\n", debugstr_w(name) ); + IRegistrar_ClearReplacements( registrar ); + IRegistrar_AddReplacement( registrar, moduleW, name ); + EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&hr ); + if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr ); +} + /* copy a fake dll file to the dest directory */ static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) { @@ -494,7 +560,8 @@ static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) ret = (WriteFile( h, data, size, &written, NULL ) && written == size); if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() ); CloseHandle( h ); - if (!ret) DeleteFileW( dest ); + if (ret) register_fake_dll( dest, data, size ); + else DeleteFileW( dest ); } } *destname = 0; /* restore it for next file */ @@ -608,7 +675,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DWORD written; ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size); - if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); + if (ret) register_fake_dll( name, buffer, size ); + else ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); } else { @@ -632,4 +700,6 @@ void cleanup_fake_dlls(void) HeapFree( GetProcessHeap(), 0, handled_dlls ); handled_dlls = NULL; handled_count = handled_total = 0; + if (registrar) IRegistrar_Release( registrar ); + registrar = NULL; } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 47c5824..cfefbe4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2489,85 +2489,36 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] ;;some dlls have to be registered first -11,,atl.dll,1 -11,,ole32.dll,1 11,,oleaut32.dll,1 11,,shell32.dll,1 -11,,actxprxy.dll,1 -11,,amstream.dll,1 -11,,avifil32.dll,1 -11,,browseui.dll,1 11,,comctl32.dll,2 -11,,comdlg32.dll,1 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 -11,,d3dxof.dll,1 -11,,ddraw.dll,1 -11,,ddrawex.dll,1 11,,devenum.dll,1 -11,,dinput.dll,1 -11,,dinput8.dll,1 -11,,dispex.dll,1 -11,,dmband.dll,1 -11,,dmcompos.dll,1 -11,,dmime.dll,1 -11,,dmloader.dll,1 -11,,dmscript.dll,1 -11,,dmstyle.dll,1 -11,,dmsynth.dll,1 -11,,dmusic.dll,1 -11,,dplayx.dll,1 -11,,dpnet.dll,1 -11,,dsound.dll,1 -11,,dswave.dll,1 -11,,dxdiagn.dll,1 -11,,explorerframe.dll,1 11,,gameux.dll,1 11,,hhctrl.ocx,1 -11,,hlink.dll,1 -11,,hnetcfg.dll,1 11,,ieframe.dll,1 -11,,inetcomm.dll,1 -11,,infosoft.dll,1 -11,,inseng.dll,1 -11,,itss.dll,1 11,,jscript.dll,1 -11,,mlang.dll,1 -11,,mmdevapi.dll,1 -11,,msctf.dll,1 -11,,msdaps.dll,1 11,,mshtml.dll,1 11,,msi.dll,1 11,,msiexec.exe,1 -11,,msimtf.dll,1 11,,msisip.dll,1 -11,,mstask.dll,1 11,,msxml.dll,1 11,,msxml2.dll,1 11,,msxml3.dll,1 11,,msxml4.dll,1 11,,msxml6.dll,1 -11,,objsel.dll,1 -11,,oledb32.dll,1 11,,qcap.dll,1 -11,,qedit.dll,1 11,,qmgr.dll,1 -11,,qmgrprxy.dll,1 11,,quartz.dll,1 -11,,rsaenh.dll,1 -11,,shdocvw.dll,1 -11,,sti.dll,1 11,,urlmon.dll,1 -11,,vbscript.dll,1 -11,,wbemprox.dll,1 11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 11,,winhttp.dll,1 11,,wintrust.dll,1 -11,,wmiutils.dll,1 11,,wuapi.dll,1 11,,iexplore.exe,1 @@ -2595,6 +2546,13 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe,- 11,,winetest.exe,- 12,,mountmgr.sys,- +; registration order matters for these +11,,msxml.dll +11,,msxml2.dll +11,,msxml3.dll +11,,msxml4.dll +11,,msxml6.dll +11,,shdocvw.dll 11,,* [FakeDlls] @@ -2614,6 +2572,13 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys +; registration order matters for these +11,,msxml.dll +11,,msxml2.dll +11,,msxml3.dll +11,,msxml4.dll +11,,msxml6.dll +11,,shdocvw.dll 10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe 10,Microsoft.NET\Framework\v1.1.4322,ngen.exe 10,Microsoft.NET\Framework\v1.1.4322,fusion.dll

1 0

Alexandre Julliard : setupapi: Allocate a virtual memory buffer to read fake dll files.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 39a4c2532b59f37747115c7d638ef922f74a8c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a4c2532b59f37747115c7d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 12:58:26 2011 +0200 setupapi: Allocate a virtual memory buffer to read fake dll files. --- dlls/setupapi/fakedll.c | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 4090fa1..27d4b8a 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -55,7 +55,7 @@ static const unsigned int section_alignment = 4096; static const unsigned int max_dll_name_len = 64; static void *file_buffer; -static size_t file_buffer_size; +static SIZE_T file_buffer_size; static unsigned int handled_count; static unsigned int handled_total; static char **handled_dlls; @@ -187,11 +187,9 @@ failed: /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ -static int read_file( const char *name, void **data, size_t *size ) +static int read_file( const char *name, void **data, SIZE_T *size ) { - static char static_file_buffer[4096]; struct stat st; - void *buffer = static_file_buffer; int fd, ret = -1; size_t header_size; IMAGE_DOS_HEADER *dos; @@ -202,29 +200,27 @@ static int read_file( const char *name, void **data, size_t *size ) if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) return 0; if (fstat( fd, &st ) == -1) goto done; *size = st.st_size; - if (st.st_size > sizeof(static_file_buffer)) + if (!file_buffer || st.st_size > file_buffer_size) { - if (!file_buffer || st.st_size > file_buffer_size) - { - HeapFree( GetProcessHeap(), 0, file_buffer ); - if (!(file_buffer = HeapAlloc( GetProcessHeap(), 0, st.st_size ))) goto done; - file_buffer_size = st.st_size; - } - buffer = file_buffer; + VirtualFree( file_buffer, 0, MEM_RELEASE ); + file_buffer = NULL; + file_buffer_size = st.st_size; + if (NtAllocateVirtualMemory( GetCurrentProcess(), &file_buffer, 0, &file_buffer_size, + MEM_COMMIT, PAGE_READWRITE )) goto done; } /* check for valid fake dll file */ if (st.st_size < min_size) goto done; header_size = min( st.st_size, 4096 ); - if (pread( fd, buffer, header_size, 0 ) != header_size) goto done; - dos = buffer; + if (pread( fd, file_buffer, header_size, 0 ) != header_size) goto done; + dos = file_buffer; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; if (dos->e_lfanew < sizeof(fakedll_signature)) goto done; if (memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) goto done; if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) goto done; - nt = (IMAGE_NT_HEADERS *)((char *)buffer + dos->e_lfanew); + nt = (IMAGE_NT_HEADERS *)((char *)file_buffer + dos->e_lfanew); if (nt->Signature == IMAGE_NT_SIGNATURE && nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) { /* wrong 32/64 type, pretend it doesn't exist */ @@ -232,10 +228,10 @@ static int read_file( const char *name, void **data, size_t *size ) goto done; } if (st.st_size == header_size || - pread( fd, (char *)buffer + header_size, + pread( fd, (char *)file_buffer + header_size, st.st_size - header_size, header_size ) == st.st_size - header_size) { - *data = buffer; + *data = file_buffer; ret = 1; } done: @@ -380,7 +376,7 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) } /* try to load a pre-compiled fake dll */ -static void *load_fake_dll( const WCHAR *name, size_t *size ) +static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) { const char *build_dir = wine_get_build_dir(); const char *path; @@ -473,7 +469,7 @@ static HANDLE create_dest_file( const WCHAR *name ) static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) { int ret; - size_t size; + SIZE_T size; void *data; DWORD written; WCHAR *destname = dest + strlenW(dest); @@ -581,7 +577,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) { HANDLE h; BOOL ret; - size_t size; + SIZE_T size; const WCHAR *filename; void *buffer; @@ -631,7 +627,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) */ void cleanup_fake_dlls(void) { - HeapFree( GetProcessHeap(), 0, file_buffer ); + if (file_buffer) VirtualFree( file_buffer, 0, MEM_RELEASE ); file_buffer = NULL; HeapFree( GetProcessHeap(), 0, handled_dlls ); handled_dlls = NULL;

1 0

Jacek Caban : ieframe: Moved WebBrowser object tests to ieframe.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 81bb472db9d3e3d7ab19a5635c325493d9a209c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81bb472db9d3e3d7ab19a5635… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:34:10 2011 +0200 ieframe: Moved WebBrowser object tests to ieframe. --- dlls/ieframe/tests/Makefile.in | 5 ++- dlls/ieframe/tests/ie.c | 1 - dlls/{shdocvw => ieframe}/tests/webbrowser.c | 38 +++++++------------------- dlls/shdocvw/tests/Makefile.in | 5 +-- dlls/shdocvw/tests/intshcut.c | 1 + 5 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in index c1d1031..fe4b1dd 100644 --- a/dlls/ieframe/tests/Makefile.in +++ b/dlls/ieframe/tests/Makefile.in @@ -1,7 +1,8 @@ TESTDLL = ieframe.dll -IMPORTS = ole32 +IMPORTS = ole32 oleaut32 user32 gdi32 C_SRCS = \ - ie.c + ie.c \ + webbrowser.c @MAKE_TEST_RULES@ diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 7a87469..6f62e23 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "ole2.h" #include "exdisp.h" diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c similarity index 99% rename from dlls/shdocvw/tests/webbrowser.c rename to dlls/ieframe/tests/webbrowser.c index eeb0a49..29ca521 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3142,38 +3142,20 @@ static void test_WebBrowser_NoContainerOlecmd(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } -static BOOL check_ie(void) -{ - IHTMLDocument5 *doc; - HRESULT hres; - - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IHTMLDocument5, (void**)&doc); - if(FAILED(hres)) - return FALSE; - - IHTMLDocument5_Release(doc); - return TRUE; -} - START_TEST(webbrowser) { OleInitialize(NULL); - if(check_ie()) { - container_hwnd = create_container_window(); - - trace("Testing WebBrowser (no download)...\n"); - test_WebBrowser(FALSE, FALSE); - test_WebBrowser(FALSE, TRUE); - trace("Testing WebBrowser...\n"); - test_WebBrowser(TRUE, FALSE); - test_WebBrowser(TRUE, TRUE); - trace("Testing WebBrowser w/o container-based olecmd...\n"); - test_WebBrowser_NoContainerOlecmd(); - }else { - win_skip("Skipping tests on too old IE\n"); - } + container_hwnd = create_container_window(); + + trace("Testing WebBrowser (no download)...\n"); + test_WebBrowser(FALSE, FALSE); + test_WebBrowser(FALSE, TRUE); + trace("Testing WebBrowser...\n"); + test_WebBrowser(TRUE, FALSE); + test_WebBrowser(TRUE, TRUE); + trace("Testing WebBrowser w/o container-based olecmd...\n"); + test_WebBrowser_NoContainerOlecmd(); OleUninitialize(); } diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 10474a1..e4cf689 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -1,10 +1,9 @@ TESTDLL = shdocvw.dll -IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = shell32 ole32 oleaut32 advapi32 C_SRCS = \ intshcut.c \ shdocvw.c \ - shortcut.c \ - webbrowser.c + shortcut.c @MAKE_TEST_RULES@ diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index ca28450..205419b 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "winerror.h" +#include "initguid.h" #include "shlobj.h" #include "shobjidl.h" #include "shlguid.h"

1 0

Jacek Caban : mshtml: Always set onclick event handler during document initialization.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: ff127a3461d8e9f638590242e38b83cb3efd6fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff127a3461d8e9f638590242e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:08:48 2011 +0200 mshtml: Always set onclick event handler during document initialization. --- dlls/mshtml/htmlevent.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c0a998b..9ab07a4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -141,6 +141,7 @@ typedef struct { #define EVENT_FORWARDBODY 0x0004 #define EVENT_NODEHANDLER 0x0008 #define EVENT_CANCELABLE 0x0010 +#define EVENT_SETONINIT 0x0020 static const event_info_t event_info[] = { {beforeunloadW, onbeforeunloadW, EVENTT_NONE, DISPID_EVMETH_ONBEFOREUNLOAD, @@ -150,7 +151,7 @@ static const event_info_t event_info[] = { {changeW, onchangeW, EVENTT_HTML, DISPID_EVMETH_ONCHANGE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENTT_MOUSE, DISPID_EVMETH_ONCLICK, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_SETONINIT}, {contextmenuW, oncontextmenuW, EVENTT_MOUSE, DISPID_EVMETH_ONCONTEXTMENU, EVENT_BUBBLE|EVENT_CANCELABLE}, {dblclickW, ondblclickW, EVENTT_MOUSE, DISPID_EVMETH_ONDBLCLICK, @@ -1371,11 +1372,23 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) HRESULT doc_init_events(HTMLDocumentNode *doc) { + unsigned i; + HRESULT hres; + doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); if(!doc->event_vector) return E_OUTOFMEMORY; init_nsevents(doc); + + for(i=0; i < EVENTID_LAST; i++) { + if(event_info[i].flags & EVENT_SETONINIT) { + hres = ensure_nsevent_handler(doc, NULL, NULL, i); + if(FAILED(hres)) + return hres; + } + } + return S_OK; }

1 0

Jacek Caban : mshtml: Always alloc event_vector for documents.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 2610ef9c9ce9e25b8a4ea6c8b3e707c34379808f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2610ef9c9ce9e25b8a4ea6c8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:08:32 2011 +0200 mshtml: Always alloc event_vector for documents. --- dlls/mshtml/htmldoc.c | 3 +-- dlls/mshtml/htmlevent.c | 16 ++++++++++------ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 38d4bf3..f625602 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2164,8 +2164,6 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLWindow *wi &doc->node.dispex.IDispatchEx_iface); HTMLDocumentNode_SecMgr_Init(doc); - init_nsevents(doc); - list_init(&doc->bindings); list_init(&doc->selection_list); list_init(&doc->range_list); @@ -2188,6 +2186,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; init_document_mutation(doc); + doc_init_events(doc); HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); doc->node.vtbl = &HTMLDocumentNodeImplVtbl; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 85e2b4b..c0a998b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1182,12 +1182,6 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) return S_OK; - if(!doc->event_vector) { - doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); - if(!doc->event_vector) - return E_OUTOFMEMORY; - } - if(!doc->event_vector[eid]) { doc->event_vector[eid] = TRUE; add_nsevent_listener(doc, NULL, event_info[eid].name); @@ -1375,6 +1369,16 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) nsAString_Finish(&attr_name_str); } +HRESULT doc_init_events(HTMLDocumentNode *doc) +{ + doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!doc->event_vector) + return E_OUTOFMEMORY; + + init_nsevents(doc); + return S_OK; +} + void release_event_target(event_target_t *event_target) { int i, j; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 5615bbd..9072482 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -53,6 +53,7 @@ HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HID HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; +HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Moved nsevents.c declarations to htmlevent.h.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: be6dd66edf38f307e16693fcefb4e866c5cb60f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6dd66edf38f307e16693fce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:08:12 2011 +0200 mshtml: Moved nsevents.c declarations to htmlevent.h. --- dlls/mshtml/htmlevent.h | 4 ++++ dlls/mshtml/mshtml_private.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1501a56..5615bbd 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -54,6 +54,10 @@ HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPE HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; +void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; +void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; +void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; + static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { return node->vtbl->get_event_target ? node->vtbl->get_event_target(node) : &node->event_target; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1a07552..66f89c9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -686,10 +686,6 @@ HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; -void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; -void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; -void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; - void set_window_bscallback(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void set_current_mon(HTMLWindow*,IMoniker*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added default click handler for anchor element.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 3742a184d247e71a41056e3a9e5ea7960e52e23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3742a184d247e71a41056e3a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:09:13 2011 +0200 mshtml: Added default click handler for anchor element. --- dlls/mshtml/htmlanchor.c | 60 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 02a05a7..9bf74b2 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -26,9 +26,10 @@ #include "winuser.h" #include "ole2.h" -#include "wine/debug.h" - #include "mshtml_private.h" +#include "htmlevent.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -40,6 +41,43 @@ typedef struct { nsIDOMHTMLAnchorElement *nsanchor; } HTMLAnchorElement; +static HRESULT navigate_anchor(HTMLAnchorElement *This) +{ + nsAString href_str, target_str; + const PRUnichar *href, *target; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsAString_GetData(&target_str, &target); + if(*target) { + FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); + nsAString_Finish(&target_str); + return S_OK; + } + + nsAString_Finish(&target_str); + + nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsAString_GetData(&href_str, &href); + if(*href) { + HTMLWindow *window = This->element.node.doc->basedoc.window; + hres = navigate_url(window, href, window->url); + }else { + TRACE("empty href\n"); + hres = S_OK; + } + + nsAString_Finish(&href_str); + return hres; +} + static inline HTMLAnchorElement *impl_from_IHTMLAnchorElement(IHTMLAnchorElement *iface) { return CONTAINING_RECORD(iface, HTMLAnchorElement, IHTMLAnchorElement_iface); @@ -542,10 +580,26 @@ static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, BOOL *prevent_default) +{ + HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); + + if(eid == EVENTID_CLICK) { + TRACE("CLICK\n"); + *prevent_default = TRUE; + return navigate_anchor(This); + } + + return S_OK; +} + static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLAnchorElement_QI, HTMLAnchorElement_destructor, - HTMLElement_clone + HTMLElement_clone, + NULL, + NULL, + HTMLAnchorElement_handle_event }; static const tid_t HTMLAnchorElement_iface_tids[] = {

1 0

Jacek Caban : mshtml: Added possibility for node implementations to add default event handlers.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 6d7667894e7ad4f4020a90a5d66a228d981cd827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7667894e7ad4f4020a90a5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:07:56 2011 +0200 mshtml: Added possibility for node implementations to add default event handlers. --- dlls/mshtml/htmlevent.c | 42 ++++++++++++++++++++++++++++++++++++------ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 11 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 49349b0..85e2b4b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -980,8 +980,10 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode HTMLEventObj *event_obj = NULL; IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; + BOOL prevent_default = FALSE; HTMLDOMNode *node; PRUint16 node_type; + nsresult nsres; HRESULT hres; TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); @@ -1053,14 +1055,42 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(nsnode) nsIDOMNode_Release(nsnode); + if(event_obj && event_obj->prevent_default) + prevent_default = TRUE; doc->basedoc.window->event = prev_event; - - if(event_obj) { - if(event_obj->prevent_default && nsevent) { - TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(nsevent); - } + if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + + if(!prevent_default) { + nsIDOMNode_AddRef(target); + nsnode = target; + + do { + hres = get_node(doc, nsnode, TRUE, &node); + if(FAILED(hres)) + break; + + if(node && node->vtbl->handle_event) { + hres = node->vtbl->handle_event(node, eid, &prevent_default); + if(FAILED(hres) || prevent_default) + break; + } + + nsres = nsIDOMNode_GetParentNode(nsnode, &parent); + if(NS_FAILED(nsres)) + break; + + nsIDOMNode_Release(nsnode); + nsnode = parent; + } while(nsnode); + + if(nsnode) + nsIDOMNode_Release(nsnode); + } + + if(prevent_default && nsevent) { + TRACE("calling PreventDefault\n"); + nsIDOMEvent_PreventDefault(nsevent); } } diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index ac6d39c..ae84ac3 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -639,6 +639,7 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { NULL, NULL, NULL, + NULL, HTMLFormElement_get_dispid, HTMLFormElement_invoke }; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 7c0cfb1..3b4126b 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -274,6 +274,7 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { NULL, NULL, NULL, + NULL, HTMLFrameElement_get_document, HTMLFrameElement_get_readystate, HTMLFrameElement_get_dispid, diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 7aba570..8a29346 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -252,6 +252,7 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { NULL, NULL, NULL, + NULL, HTMLIFrame_get_document, HTMLIFrame_get_readystate, HTMLIFrame_get_dispid, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 1fb0e83..2f72484 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -663,6 +663,7 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { NULL, NULL, NULL, + NULL, HTMLImgElement_get_readystate }; diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 2428120..9d19761 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1187,6 +1187,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLElement_clone, NULL, HTMLInputElementImpl_fire_event, + NULL, HTMLInputElementImpl_put_disabled, HTMLInputElementImpl_get_disabled, }; diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index dce6c8c..50e04a9 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -475,6 +475,7 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { NULL, NULL, NULL, + NULL, HTMLObjectElement_get_readystate, HTMLObjectElement_get_dispid, HTMLObjectElement_invoke diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 7b4cbc9..ca0524f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -335,6 +335,7 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { NULL, NULL, NULL, + NULL, HTMLScriptElement_get_readystate }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3208bbc..6d2e393 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -617,6 +617,7 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLElement_clone, NULL, NULL, + NULL, HTMLSelectElementImpl_put_disabled, HTMLSelectElementImpl_get_disabled, NULL, diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 3b7651d..ae2fd6a 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -449,6 +449,7 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLElement_clone, NULL, NULL, + NULL, HTMLTextAreaElementImpl_put_disabled, HTMLTextAreaElementImpl_get_disabled }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c3d648d..1a07552 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -499,6 +499,7 @@ typedef struct { HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**); event_target_t **(*get_event_target)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); + HRESULT (*handle_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);

1 0

Jacek Caban : mshtml: Rename call_event to fire_event.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: aa6ee29e0147f7a8abfe500e3320df72022f7430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6ee29e0147f7a8abfe500e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 11:07:12 2011 +0200 mshtml: Rename call_event to fire_event. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 40c8ff5..c4e0f0a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1371,7 +1371,7 @@ static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface) TRACE("(%p)\n", This); - return call_event(&This->node, EVENTID_CLICK); + return call_fire_event(&This->node, EVENTID_CLICK); } static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f638b9a..49349b0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1088,14 +1088,14 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return S_OK; } -HRESULT call_event(HTMLDOMNode *node, eventid_t eid) +HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) { HRESULT hres; - if(node->vtbl->call_event) { + if(node->vtbl->fire_event) { BOOL handled = FALSE; - hres = node->vtbl->call_event(node, eid, &handled); + hres = node->vtbl->fire_event(node, eid, &handled); if(handled) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f48afee..1501a56 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -51,7 +51,7 @@ HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(event_target_t**,nsIDOMNode*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; -HRESULT call_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; +HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; static inline event_target_t **get_node_event_target(HTMLDOMNode *node) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 0775436..2428120 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1150,7 +1150,7 @@ static void HTMLInputElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -static HRESULT HTMLInputElementImpl_call_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled) +static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); @@ -1186,7 +1186,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_destructor, HTMLElement_clone, NULL, - HTMLInputElementImpl_call_event, + HTMLInputElementImpl_fire_event, HTMLInputElementImpl_put_disabled, HTMLInputElementImpl_get_disabled, }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 35b9349..c3d648d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -498,7 +498,7 @@ typedef struct { void (*destructor)(HTMLDOMNode*); HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**); event_target_t **(*get_event_target)(HTMLDOMNode*); - HRESULT (*call_event)(HTMLDOMNode*,DWORD,BOOL*); + HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
77
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 August 2011