July 2006 - Wine-commits - list.winehq.org

James Hawkins : msi: Set the install state to INSTALLSTATE_LOCAL for components with compressed files .
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 98d148641046bba33845b11178b76be121ae2b0f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98d148641046bba33845b11… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 31 11:15:52 2006 -0700 msi: Set the install state to INSTALLSTATE_LOCAL for components with compressed files. --- dlls/msi/action.c | 6 ++++++ dlls/msi/tests/package.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ccdb3c4..37513e0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1323,6 +1323,12 @@ static UINT load_file(MSIRECORD *row, LP file->state = msifs_invalid; + if (file->Attributes & msidbFileAttributesCompressed) + { + file->Component->Action = INSTALLSTATE_LOCAL; + file->Component->ActionRequest = INSTALLSTATE_LOCAL; + } + TRACE("File Loaded (%s)\n",debugstr_w(file->File)); list_add_tail( &package->files, &file->entry ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9057a9b..ecc333d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1744,10 +1744,7 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "eta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); MsiCloseHandle( hpkg ); }

1 0

Robert Shearman : oleaut32: Add some validation for the DISPPARAMS structure in ITypeInfo::Invoke.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 33582cc69e67dda776dd8c05758115584f41aa4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33582cc69e67dda776dd8c0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 31 16:44:02 2006 +0100 oleaut32: Add some validation for the DISPPARAMS structure in ITypeInfo::Invoke. --- dlls/oleaut32/tests/typelib.c | 9 +++++++++ dlls/oleaut32/typelib.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 30fa962..852d08d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -461,6 +461,15 @@ static void test_TypeInfo(void) hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + /* test NULL dispparams */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08lx\n", hr); + + /* test dispparams->cNamedArgs being bigger than dispparams->cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08lx\n", hr); + ITypeInfo_Release(pTypeInfo); hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3ba1b4e..0e58ae8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5218,8 +5218,22 @@ static HRESULT WINAPI ITypeInfo_fnInvoke TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p)\n", This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); + + if (!pDispParams) + { + ERR("NULL pDispParams not allowed\n"); + return E_INVALIDARG; + } + dump_DispParms(pDispParams); + if (pDispParams->cNamedArgs > pDispParams->cArgs) + { + ERR("named argument array cannot be bigger than argument array (%d/%d)\n", + pDispParams->cNamedArgs, pDispParams->cArgs); + return E_INVALIDARG; + } + /* we do this instead of using GetFuncDesc since it will return a fake * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next)

1 0

Alexandre Julliard : ntdll: Set initial module refcount to 1 to avoid unloading during imports fixup.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: d16c7f96c9cbc1da90bc0246321b2de0e0e4b4af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d16c7f96c9cbc1da90bc024… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 21:03:01 2006 +0200 ntdll: Set initial module refcount to 1 to avoid unloading during imports fixup. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0ca8f2a..d3a3d78 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -640,7 +640,7 @@ static WINE_MODREF *alloc_module( HMODUL wm->ldr.EntryPoint = NULL; wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; wm->ldr.Flags = LDR_DONT_RESOLVE_REFS; - wm->ldr.LoadCount = 0; + wm->ldr.LoadCount = 1; wm->ldr.TlsIndex = -1; wm->ldr.SectionHandle = NULL; wm->ldr.CheckSum = 0;

1 0

Alexandre Julliard : ntdll: Move the calling of the process entry point back to kernel32.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 6f7b1f646389f850bc48abf79271037455fc91c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f7b1f646389f850bc48abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 21:25:29 2006 +0200 ntdll: Move the calling of the process entry point back to kernel32. Apparently some copy protection stuff relies on that. This reverts commit 50fca716fddf5af03b4c91ae5e950daff5fbdf2a. --- dlls/kernel/process.c | 17 +++++++++++++++++ dlls/ntdll/loader.c | 15 ++------------- include/winternl.h | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index a2ab351..7092d2c 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -60,6 +60,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(file); +WINE_DECLARE_DEBUG_CHANNEL(relay); typedef struct { @@ -802,7 +803,23 @@ static void start_process( void *arg ) { __TRY { + PEB *peb = NtCurrentTeb()->Peb; + IMAGE_NT_HEADERS *nt; + LPTHREAD_START_ROUTINE entry; + LdrInitializeThunk( 0, 0, 0, 0 ); + + nt = RtlImageNtHeader( peb->ImageBaseAddress ); + entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + + nt->OptionalHeader.AddressOfEntryPoint); + + if (TRACE_ON(relay)) + DPRINTF( "%04lx:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + + SetLastError( 0 ); /* clear error code */ + if (peb->BeingDebugged) DbgBreakPoint(); + ExitProcess( entry( peb ) ); } __EXCEPT(UnhandledExceptionFilter) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d3a3d78..184f64f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2094,8 +2094,6 @@ void WINAPI LdrInitializeThunk( ULONG un LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); - LPTHREAD_START_ROUTINE entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + - nt->OptionalHeader.AddressOfEntryPoint); if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ @@ -2128,7 +2126,7 @@ void WINAPI LdrInitializeThunk( ULONG un SERVER_START_REQ( init_process_done ) { req->module = peb->ImageBaseAddress; - req->entry = entry; + req->entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); status = wine_server_call( req ); } @@ -2153,16 +2151,7 @@ void WINAPI LdrInitializeThunk( ULONG un RtlLeaveCriticalSection( &loader_section ); if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); - - if (TRACE_ON(relay)) - DPRINTF( "%04lx:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); - - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_SUCCESS ); /* clear error code */ - if (peb->BeingDebugged) DbgBreakPoint(); - status = entry( peb ); - LdrShutdownProcess(); - NtTerminateProcess( GetCurrentProcess(), status ); + return; error: ERR( "Main exe initialization for %s failed, status %lx\n", diff --git a/include/winternl.h b/include/winternl.h index c8aa3ed..5177348 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1726,7 +1726,7 @@ NTSTATUS WINAPI LdrFindResourceDirector NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSTATUS WINAPI LdrGetDllHandle(ULONG, ULONG, const UNICODE_STRING*, HMODULE*); NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); -void DECLSPEC_NORETURN WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); +void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); void WINAPI LdrShutdownProcess(void); void WINAPI LdrShutdownThread(void);

1 0

Robert Shearman : ole32: Remove a check on the share mode for the NULL filename case as the check is already done earlier in StgCreateDocfile .
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 1a5cd3ca9bb4fc56221b9b0b74edf255a6826ee3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a5cd3ca9bb4fc56221b9b0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 31 16:43:46 2006 +0100 ole32: Remove a check on the share mode for the NULL filename case as the check is already done earlier in StgCreateDocfile. --- dlls/ole32/storage32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fd252d8..f827251 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5661,9 +5661,6 @@ HRESULT WINAPI StgCreateDocfile( WCHAR tempPath[MAX_PATH]; static const WCHAR prefix[] = { 'S', 'T', 'O', 0 }; - if (STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE) - goto end; - memset(tempPath, 0, sizeof(tempPath)); memset(tempFileName, 0, sizeof(tempFileName));

1 0

Robert Shearman : ole32: Implement OleNoteObjectVisible as described by MSDN.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: e3e42985ec6a703b933096b8abc7c181d8bc0a4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3e42985ec6a703b933096b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 31 16:43:50 2006 +0100 ole32: Implement OleNoteObjectVisible as described by MSDN. --- dlls/ole32/ole2.c | 10 ++++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index d0f4a78..576873d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2389,6 +2389,16 @@ BOOL WINAPI OleIsRunning(LPOLEOBJECT pOb } /*********************************************************************** + * OleNoteObjectVisible [OLE32.@] + */ +HRESULT WINAPI OleNoteObjectVisible(LPUNKNOWN pUnknown, BOOL bVisible) +{ + TRACE("(%p, %s)\n", pUnknown, bVisible ? "TRUE" : "FALSE"); + return CoLockObjectExternal(pUnknown, bVisible, TRUE); +} + + +/*********************************************************************** * OLE_FreeClipDataArray [internal] * * NOTES: diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 87605ca..5c26b31 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -200,7 +200,7 @@ @ stdcall OleLoadFromStream(ptr ptr ptr) @ stdcall OleLockRunning(ptr long long) @ stdcall OleMetafilePictFromIconAndLabel(long ptr ptr long) -@ stub OleNoteObjectVisible +@ stdcall OleNoteObjectVisible(ptr long) @ stdcall OleQueryCreateFromData(ptr) @ stdcall OleQueryLinkFromData(ptr) @ stdcall OleRegEnumFormatEtc(ptr long ptr)

1 0

Alexandre Julliard : preloader: Properly use the ELF hash table when looking up a symbol.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 8aab67d23805b65956c589297ff1ff76f0e0aa8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8aab67d23805b65956c5892… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 15:48:32 2006 +0200 preloader: Properly use the ELF hash table when looking up a symbol. --- loader/preloader.c | 37 ++++++++++++++++++++++++++++++------- 1 files changed, 30 insertions(+), 7 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 46e96a5..d372ed7 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -745,6 +745,19 @@ #endif } +static unsigned int elf_hash( const char *name ) +{ + unsigned int hi, hash = 0; + while (*name) + { + hash = (hash << 4) + (unsigned char)*name++; + hi = hash & 0xf0000000; + hash ^= hi; + hash ^= hi >> 24; + } + return hash; +} + /* * Find a symbol in the symbol table of the executable loaded */ @@ -753,8 +766,8 @@ static void *find_symbol( const ElfW(Phd const ElfW(Dyn) *dyn = NULL; const ElfW(Phdr) *ph; const ElfW(Sym) *symtab = NULL; + const Elf_Symndx *hashtab = NULL; const char *strings = NULL; - uint32_t i, symtabend = 0; /* check the values */ #ifdef DUMP_SYMS @@ -785,7 +798,7 @@ #endif if( dyn->d_tag == DT_SYMTAB ) symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; if( dyn->d_tag == DT_HASH ) - symtabend = *((const uint32_t *)dyn->d_un.d_ptr + 1); + hashtab = (const Elf_Symndx *)dyn->d_un.d_ptr; #ifdef DUMP_SYMS wld_printf("%x %x\n", dyn->d_tag, dyn->d_un.d_ptr ); #endif @@ -794,15 +807,25 @@ #endif if( (!symtab) || (!strings) ) return NULL; - for (i = 0; i < symtabend; i++) + if (hashtab) { - if( ( ELF32_ST_BIND(symtab[i].st_info) == STT_OBJECT ) && - ( 0 == wld_strcmp( strings+symtab[i].st_name, var ) ) ) + Elf_Symndx nbuckets = hashtab[0]; + unsigned int hash = elf_hash(var) % nbuckets; + const Elf_Symndx *buckets = hashtab + 2; + const Elf_Symndx *chains = buckets + nbuckets; + Elf_Symndx idx = buckets[hash]; + + while (idx != STN_UNDEF) { + if( ( ELF32_ST_BIND(symtab[idx].st_info) == STT_OBJECT ) && + !wld_strcmp( strings + symtab[idx].st_name, var )) + { #ifdef DUMP_SYMS - wld_printf("Found %s -> %x\n", strings+symtab[i].st_name, symtab[i].st_value ); + wld_printf("Found %s -> %x\n", strings + symtab[idx].st_name, symtab[idx].st_value ); #endif - return (void*)symtab[i].st_value; + return (void*)symtab[idx].st_value; + } + idx = chains[idx]; } } return NULL;

1 0

Alexandre Julliard : preloader: Fixed type checking in symbol lookup.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 51d84822228322e71b300862ee28947384d9abfb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51d84822228322e71b30086… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 16:44:40 2006 +0200 preloader: Fixed type checking in symbol lookup. --- loader/preloader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index d372ed7..52f4cc1 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -761,7 +761,7 @@ static unsigned int elf_hash( const char /* * Find a symbol in the symbol table of the executable loaded */ -static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var ) +static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int type ) { const ElfW(Dyn) *dyn = NULL; const ElfW(Phdr) *ph; @@ -817,7 +817,7 @@ #endif while (idx != STN_UNDEF) { - if( ( ELF32_ST_BIND(symtab[idx].st_info) == STT_OBJECT ) && + if (symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && !wld_strcmp( strings + symtab[idx].st_name, var )) { #ifdef DUMP_SYMS @@ -991,7 +991,7 @@ #endif /* store pointer to the preload info into the appropriate main binary variable */ wine_main_preload_info = find_symbol( main_binary_map.l_phdr, main_binary_map.l_phnum, - "wine_main_preload_info" ); + "wine_main_preload_info", STT_OBJECT ); if (wine_main_preload_info) *wine_main_preload_info = preload_info; else wld_printf( "wine_main_preload_info not found\n" );

1 0

Alexandre Julliard : preloader: Added support for the new style DT_GNU_HASH symbol table.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 30a3866b78baf978e18197ff714c09346c51665d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30a3866b78baf978e18197f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 21:02:38 2006 +0200 preloader: Added support for the new style DT_GNU_HASH symbol table. --- loader/preloader.c | 59 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 13 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 52f4cc1..7140f3a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -131,6 +131,10 @@ #ifndef AT_SYSINFO_EHDR #define AT_SYSINFO_EHDR 33 #endif +#ifndef DT_GNU_HASH +#define DT_GNU_HASH 0x6ffffef5 +#endif + static unsigned int page_size, page_mask; static char *preloader_start, *preloader_end; @@ -758,6 +762,13 @@ static unsigned int elf_hash( const char return hash; } +static unsigned int gnu_hash( const char *name ) +{ + unsigned int h = 5381; + while (*name) h = h * 33 + (unsigned char)*name++; + return h; +} + /* * Find a symbol in the symbol table of the executable loaded */ @@ -767,7 +778,9 @@ static void *find_symbol( const ElfW(Phd const ElfW(Phdr) *ph; const ElfW(Sym) *symtab = NULL; const Elf_Symndx *hashtab = NULL; + const Elf32_Word *gnu_hashtab = NULL; const char *strings = NULL; + Elf_Symndx idx; /* check the values */ #ifdef DUMP_SYMS @@ -799,6 +812,8 @@ #endif symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; if( dyn->d_tag == DT_HASH ) hashtab = (const Elf_Symndx *)dyn->d_un.d_ptr; + if( dyn->d_tag == DT_GNU_HASH ) + gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; #ifdef DUMP_SYMS wld_printf("%x %x\n", dyn->d_tag, dyn->d_un.d_ptr ); #endif @@ -807,28 +822,46 @@ #endif if( (!symtab) || (!strings) ) return NULL; - if (hashtab) + if (gnu_hashtab) /* new style hash table */ + { + const unsigned int hash = gnu_hash(var); + const Elf32_Word nbuckets = gnu_hashtab[0]; + const Elf32_Word symbias = gnu_hashtab[1]; + const Elf32_Word nwords = gnu_hashtab[2]; + const ElfW(Addr) *bitmask = (const ElfW(Addr) *)(gnu_hashtab + 4); + const Elf32_Word *buckets = (const Elf32_Word *)(bitmask + nwords); + const Elf32_Word *chains = buckets + nbuckets - symbias; + + if (!(idx = buckets[hash % nbuckets])) return NULL; + do + { + if ((chains[idx] & ~1u) == (hash & ~1u) && + symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + !wld_strcmp( strings + symtab[idx].st_name, var )) + goto found; + } while (!(chains[idx++] & 1u)); + } + else if (hashtab) /* old style hash table */ { - Elf_Symndx nbuckets = hashtab[0]; - unsigned int hash = elf_hash(var) % nbuckets; + const unsigned int hash = elf_hash(var); + const Elf_Symndx nbuckets = hashtab[0]; const Elf_Symndx *buckets = hashtab + 2; - const Elf_Symndx *chains = buckets + nbuckets; - Elf_Symndx idx = buckets[hash]; + const Elf_Symndx *chains = buckets + nbuckets; - while (idx != STN_UNDEF) + for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) { if (symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && !wld_strcmp( strings + symtab[idx].st_name, var )) - { -#ifdef DUMP_SYMS - wld_printf("Found %s -> %x\n", strings + symtab[idx].st_name, symtab[idx].st_value ); -#endif - return (void*)symtab[idx].st_value; - } - idx = chains[idx]; + goto found; } } return NULL; + +found: +#ifdef DUMP_SYMS + wld_printf("Found %s -> %x\n", strings + symtab[idx].st_name, symtab[idx].st_value ); +#endif + return (void *)symtab[idx].st_value; } /*

1 0

Jacek Caban : shdocvw: Added WebBrowser::Invoke implementation.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: d4da27aec3dca99c3b33fa329db6c257b0ce35fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4da27aec3dca99c3b33fa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 31 13:27:22 2006 +0200 shdocvw: Added WebBrowser::Invoke implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/shdocvw_main.c | 26 ++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 15 ++++++++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 17ac8e7..2f9f9cc 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -212,6 +212,7 @@ extern void register_iewindow_class(void extern void unregister_iewindow_class(void); HRESULT register_class_object(BOOL); +HRESULT get_typeinfo(ITypeInfo**); /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 57b4993..ab962a1 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -40,6 +40,30 @@ LONG SHDOCVW_refCount = 0; HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; +static ITypeInfo *wb_typeinfo = NULL; + +HRESULT get_typeinfo(ITypeInfo **typeinfo) +{ + ITypeLib *typelib; + HRESULT hres; + + if(wb_typeinfo) { + *typeinfo = wb_typeinfo; + return S_OK; + } + + hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &typelib); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08lx\n", hres); + return hres; + } + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IWebBrowser2, &wb_typeinfo); + ITypeLib_Release(typelib); + + *typeinfo = wb_typeinfo; + return hres; +} /************************************************************************* * SHDOCVW DllMain @@ -56,6 +80,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWO case DLL_PROCESS_DETACH: if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); unregister_iewindow_class(); + if(wb_typeinfo) + ITypeInfo_Release(wb_typeinfo); break; } return TRUE; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 2755bdd..6d46132 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -172,9 +172,18 @@ static HRESULT WINAPI WebBrowser_Invoke( EXCEPINFO *pExepInfo, UINT *puArgErr) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - return E_NOTIMPL; + + hres = get_typeinfo(&typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_Invoke(typeinfo, WEBBROWSER2(This), dispIdMember, wFlags, pDispParams, + pVarResult, pExepInfo, puArgErr); } /* IWebBrowser methods */ @@ -923,7 +932,7 @@ static HRESULT WebBrowser_Create(INT ver WebBrowser *ret; HRESULT hres; - TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); + TRACE("(%p %s %p) version=%d\n", pOuter, debugstr_guid(riid), ppv, version); ret = shdocvw_alloc(sizeof(WebBrowser));

1 0