December 2010 - Wine-commits

Michael Stefaniuc : ole32: Use ifaces instead of vtbl pointers in DataCache .
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: feba7c37b417c76c63f1fa0375b89fd551f58c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=feba7c37b417c76c63f1fa037… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:05:04 2010 +0100 ole32: Use ifaces instead of vtbl pointers in DataCache. --- dlls/ole32/datacache.c | 75 +++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 768dec7..9b32da6 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -121,18 +121,18 @@ typedef struct DataCacheEntry struct DataCache { /* - * List all interface VTables here + * List all interface here */ - const IDataObjectVtbl* lpVtbl; - const IUnknownVtbl* lpvtblNDIUnknown; - const IPersistStorageVtbl* lpvtblIPersistStorage; - const IViewObject2Vtbl* lpvtblIViewObject; - const IOleCache2Vtbl* lpvtblIOleCache2; - const IOleCacheControlVtbl* lpvtblIOleCacheControl; + IDataObject IDataObject_iface; + IUnknown IUnknown_iface; + IPersistStorage IPersistStorage_iface; + IViewObject2 IViewObject2_iface; + IOleCache2 IOleCache2_iface; + IOleCacheControl IOleCacheControl_iface; /* The sink that is connected to a remote object. The other interfaces are not available by QI'ing the sink and vice-versa */ - const IAdviseSinkVtbl* lpvtblIAdviseSink; + IAdviseSink IAdviseSink_iface; /* * Reference count of this object @@ -175,37 +175,37 @@ typedef struct DataCache DataCache; static inline DataCache *impl_from_IDataObject( IDataObject *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpVtbl)); + return CONTAINING_RECORD(iface, DataCache, IDataObject_iface); } -static inline DataCache *impl_from_NDIUnknown( IUnknown *iface ) +static inline DataCache *impl_from_IUnknown( IUnknown *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblNDIUnknown)); + return CONTAINING_RECORD(iface, DataCache, IUnknown_iface); } static inline DataCache *impl_from_IPersistStorage( IPersistStorage *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIPersistStorage)); + return CONTAINING_RECORD(iface, DataCache, IPersistStorage_iface); } static inline DataCache *impl_from_IViewObject2( IViewObject2 *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIViewObject)); + return CONTAINING_RECORD(iface, DataCache, IViewObject2_iface); } static inline DataCache *impl_from_IOleCache2( IOleCache2 *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIOleCache2)); + return CONTAINING_RECORD(iface, DataCache, IOleCache2_iface); } static inline DataCache *impl_from_IOleCacheControl( IOleCacheControl *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIOleCacheControl)); + return CONTAINING_RECORD(iface, DataCache, IOleCacheControl_iface); } static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface ) { - return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIAdviseSink)); + return CONTAINING_RECORD(iface, DataCache, IAdviseSink_iface); } static const char * debugstr_formatetc(const FORMATETC *formatetc) @@ -879,7 +879,7 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( REFIID riid, void** ppvObject) { - DataCache *this = impl_from_NDIUnknown(iface); + DataCache *this = impl_from_IUnknown(iface); if ( ppvObject==0 ) return E_INVALIDARG; @@ -892,26 +892,26 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( } else if (IsEqualIID(&IID_IDataObject, riid)) { - *ppvObject = &this->lpVtbl; + *ppvObject = &this->IDataObject_iface; } else if ( IsEqualIID(&IID_IPersistStorage, riid) || IsEqualIID(&IID_IPersist, riid) ) { - *ppvObject = &this->lpvtblIPersistStorage; + *ppvObject = &this->IPersistStorage_iface; } else if ( IsEqualIID(&IID_IViewObject, riid) || IsEqualIID(&IID_IViewObject2, riid) ) { - *ppvObject = &this->lpvtblIViewObject; + *ppvObject = &this->IViewObject2_iface; } else if ( IsEqualIID(&IID_IOleCache, riid) || IsEqualIID(&IID_IOleCache2, riid) ) { - *ppvObject = &this->lpvtblIOleCache2; + *ppvObject = &this->IOleCache2_iface; } else if ( IsEqualIID(&IID_IOleCacheControl, riid) ) { - *ppvObject = &this->lpvtblIOleCacheControl; + *ppvObject = &this->IOleCacheControl_iface; } if ((*ppvObject)==0) @@ -934,7 +934,7 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( static ULONG WINAPI DataCache_NDIUnknown_AddRef( IUnknown* iface) { - DataCache *this = impl_from_NDIUnknown(iface); + DataCache *this = impl_from_IUnknown(iface); return InterlockedIncrement(&this->ref); } @@ -947,7 +947,7 @@ static ULONG WINAPI DataCache_NDIUnknown_AddRef( static ULONG WINAPI DataCache_NDIUnknown_Release( IUnknown* iface) { - DataCache *this = impl_from_NDIUnknown(iface); + DataCache *this = impl_from_IUnknown(iface); ULONG ref; ref = InterlockedDecrement(&this->ref); @@ -1882,7 +1882,7 @@ static HRESULT setup_sink(DataCache *This, DataCacheEntry *cache_entry) if(This->running_object) if(!(flags & ADVF_NODATA)) hr = IDataObject_DAdvise(This->running_object, &cache_entry->fmtetc, flags, - (IAdviseSink *)&This->lpvtblIAdviseSink, &cache_entry->sink_id); + &This->IAdviseSink_iface, &cache_entry->sink_id); return hr; } @@ -2012,8 +2012,7 @@ static HRESULT WINAPI DataCache_DiscardCache( TRACE("(%d)\n", dwDiscardOptions); if (dwDiscardOptions == DISCARDCACHE_SAVEIFDIRTY) - hr = DataCache_Save((IPersistStorage *)&This->lpvtblIPersistStorage, - This->presentationStorage, TRUE); + hr = DataCache_Save(&This->IPersistStorage_iface, This->presentationStorage, TRUE); LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { @@ -2152,7 +2151,7 @@ static void WINAPI DataCache_OnDataChange(IAdviseSink *iface, FORMATETC *fmt, ST { DataCache *This = impl_from_IAdviseSink(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_formatetc(fmt), med); - IOleCache_SetData((IOleCache2*)&This->lpvtblIOleCache2, fmt, med, FALSE); + IOleCache_SetData(&This->IOleCache2_iface, fmt, med, FALSE); } static void WINAPI DataCache_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) @@ -2284,13 +2283,13 @@ static DataCache* DataCache_Construct( /* * Initialize the virtual function table. */ - newObject->lpVtbl = &DataCache_IDataObject_VTable; - newObject->lpvtblNDIUnknown = &DataCache_NDIUnknown_VTable; - newObject->lpvtblIPersistStorage = &DataCache_IPersistStorage_VTable; - newObject->lpvtblIViewObject = &DataCache_IViewObject2_VTable; - newObject->lpvtblIOleCache2 = &DataCache_IOleCache2_VTable; - newObject->lpvtblIOleCacheControl = &DataCache_IOleCacheControl_VTable; - newObject->lpvtblIAdviseSink = &DataCache_IAdviseSink_VTable; + newObject->IDataObject_iface.lpVtbl = &DataCache_IDataObject_VTable; + newObject->IUnknown_iface.lpVtbl = &DataCache_NDIUnknown_VTable; + newObject->IPersistStorage_iface.lpVtbl = &DataCache_IPersistStorage_VTable; + newObject->IViewObject2_iface.lpVtbl = &DataCache_IViewObject2_VTable; + newObject->IOleCache2_iface.lpVtbl = &DataCache_IOleCache2_VTable; + newObject->IOleCacheControl_iface.lpVtbl = &DataCache_IOleCacheControl_VTable; + newObject->IAdviseSink_iface.lpVtbl = &DataCache_IAdviseSink_VTable; /* * Start with one reference count. The caller of this function @@ -2305,7 +2304,7 @@ static DataCache* DataCache_Construct( * lifetime. */ if (pUnkOuter==NULL) - pUnkOuter = (IUnknown*)&(newObject->lpvtblNDIUnknown); + pUnkOuter = &newObject->IUnknown_iface; newObject->outerUnknown = pUnkOuter; @@ -2385,13 +2384,13 @@ HRESULT WINAPI CreateDataCache( /* * Make sure it supports the interface required by the caller. */ - hr = IUnknown_QueryInterface((IUnknown*)&(newCache->lpvtblNDIUnknown), riid, ppvObj); + hr = IUnknown_QueryInterface(&newCache->IUnknown_iface, riid, ppvObj); /* * Release the reference obtained in the constructor. If * the QueryInterface was unsuccessful, it will free the class. */ - IUnknown_Release((IUnknown*)&(newCache->lpvtblNDIUnknown)); + IUnknown_Release(&newCache->IUnknown_iface); return hr; }

1 0

Michael Stefaniuc : ole32: Standardize the COM usage in defaulthandler.c.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 91ecb05f29c845cfc65225ddd9e3cd5d76cec5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ecb05f29c845cfc65225ddd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:05:43 2010 +0100 ole32: Standardize the COM usage in defaulthandler.c. --- dlls/ole32/defaulthandler.c | 87 ++++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91ecb05f29c845cfc6522…

1 0

Alexandre Julliard : server: Use the syscall function instead of inline assembly.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 0ae38162640084c432c92397c76a2c38dbd257ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae38162640084c432c92397c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 23 16:10:12 2010 +0100 server: Use the syscall function instead of inline assembly. --- server/change.c | 27 +++------------------------ server/fd.c | 24 +++--------------------- 2 files changed, 6 insertions(+), 45 deletions(-) diff --git a/server/change.c b/server/change.c index 2bdc444..5eb1df6 100644 --- a/server/change.c +++ b/server/change.c @@ -98,38 +98,17 @@ struct inotify_event { static inline int inotify_init( void ) { - int ret; - __asm__ __volatile__( "int $0x80" - : "=a" (ret) - : "0" (SYS_inotify_init)); - if (ret<0) { errno = -ret; ret = -1; } - return ret; + return syscall( SYS_inotify_init ); } static inline int inotify_add_watch( int fd, const char *name, unsigned int mask ) { - int ret; - __asm__ __volatile__( "pushl %%ebx;\n\t" - "movl %2,%%ebx;\n\t" - "int $0x80;\n\t" - "popl %%ebx" - : "=a" (ret) : "0" (SYS_inotify_add_watch), - "r" (fd), "c" (name), "d" (mask) ); - if (ret<0) { errno = -ret; ret = -1; } - return ret; + return syscall( SYS_inotify_add_watch, fd, name, mask ); } static inline int inotify_rm_watch( int fd, int wd ) { - int ret; - __asm__ __volatile__( "pushl %%ebx;\n\t" - "movl %2,%%ebx;\n\t" - "int $0x80;\n\t" - "popl %%ebx" - : "=a" (ret) : "0" (SYS_inotify_rm_watch), - "r" (fd), "c" (wd) ); - if (ret<0) { errno = -ret; ret = -1; } - return ret; + return syscall( SYS_inotify_rm_watch, fd, wd ); } #define USE_INOTIFY diff --git a/server/fd.c b/server/fd.c index bc1d853..e0ec708 100644 --- a/server/fd.c +++ b/server/fd.c @@ -127,38 +127,20 @@ struct epoll_event epoll_data_t data; }; -#define SYSCALL_RET(ret) do { \ - if (ret < 0) { errno = -ret; ret = -1; } \ - return ret; \ - } while(0) - static inline int epoll_create( int size ) { - int ret; - __asm__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (254 /*NR_epoll_create*/), "r" (size) ); - SYSCALL_RET(ret); + return syscall( 254 /*NR_epoll_create*/, size ); } static inline int epoll_ctl( int epfd, int op, int fd, const struct epoll_event *event ) { - int ret; - __asm__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) - : "0" (255 /*NR_epoll_ctl*/), "r" (epfd), "c" (op), "d" (fd), "S" (event), "m" (*event) ); - SYSCALL_RET(ret); + return syscall( 255 /*NR_epoll_ctl*/, epfd, op, fd, event ); } static inline int epoll_wait( int epfd, struct epoll_event *events, int maxevents, int timeout ) { - int ret; - __asm__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) - : "0" (256 /*NR_epoll_wait*/), "r" (epfd), "c" (events), "d" (maxevents), "S" (timeout) - : "memory" ); - SYSCALL_RET(ret); + return syscall( 256 /*NR_epoll_wait*/, epfd, events, maxevents, timeout ); } -#undef SYSCALL_RET #endif /* linux && __i386__ && HAVE_STDINT_H */

1 0

Alexandre Julliard : ntdll: Use the syscall function instead of inline assembly.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 37ae7a533c8df69789d4a3b3c66502179eacaca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ae7a533c8df69789d4a3b3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 23 16:10:18 2010 +0100 ntdll: Use the syscall function instead of inline assembly. --- dlls/ntdll/directory.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 865c2fa..0cfa85d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -112,17 +112,7 @@ typedef struct static inline int getdents64( int fd, char *de, unsigned int size ) { - int ret; - __asm__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) - : "0" (220 /*NR_getdents64*/), "r" (fd), "c" (de), "d" (size) - : "memory" ); - if (ret < 0) - { - errno = -ret; - ret = -1; - } - return ret; + return syscall( 220 /* NR_getdents64 */, fd, de, size ); } #define USE_GETDENTS

1 0

Alexandre Julliard : libwine: Use the syscall function instead of inline assembly.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 378df94ef8f4fa5ca254c1aca408283342b25b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378df94ef8f4fa5ca254c1aca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 23 17:07:35 2010 +0100 libwine: Use the syscall function instead of inline assembly. --- libs/wine/ldt.c | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index d56790f..c4dcb0e 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -70,34 +70,12 @@ static inline void fill_modify_ldt_struct( struct modify_ldt_s *ptr, const LDT_E static inline int modify_ldt( int func, struct modify_ldt_s *ptr, unsigned long count ) { - int res; - __asm__ __volatile__( "pushl %%ebx\n\t" - "movl %2,%%ebx\n\t" - "int $0x80\n\t" - "popl %%ebx" - : "=a" (res) - : "0" (SYS_modify_ldt), - "r" (func), - "c" (ptr), - "d" (count), - "m" (*ptr) ); - if (res >= 0) return res; - errno = -res; - return -1; + return syscall( SYS_modify_ldt, func, ptr, count ); } static inline int set_thread_area( struct modify_ldt_s *ptr ) { - int res; - __asm__ __volatile__( "pushl %%ebx\n\t" - "movl %3,%%ebx\n\t" - "int $0x80\n\t" - "popl %%ebx" - : "=a" (res), "=m" (*ptr) - : "0" (243) /* SYS_set_thread_area */, "q" (ptr), "m" (*ptr) ); - if (res >= 0) return res; - errno = -res; - return -1; + return syscall( 243 /* SYS_set_thread_area */, ptr ); } #endif /* linux */

1 0

David Hedberg : shell32: Add IInputObject stub to ExplorerBrowser.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 35a45d8190c7efd72ceb7a43edb34d4445fc62f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a45d8190c7efd72ceb7a43e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Dec 23 14:52:30 2010 +0100 shell32: Add IInputObject stub to ExplorerBrowser. --- dlls/shell32/ebrowser.c | 67 +++++++++++++++++++++++++ dlls/shell32/tests/ebrowser.c | 109 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 50e5a4f..ea44337 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -58,6 +58,7 @@ typedef struct _ExplorerBrowserImpl { ICommDlgBrowser3 ICommDlgBrowser3_iface; IObjectWithSite IObjectWithSite_iface; INameSpaceTreeControlEvents INameSpaceTreeControlEvents_iface; + IInputObject IInputObject_iface; LONG ref; BOOL destroyed; @@ -790,6 +791,10 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->IObjectWithSite_iface; } + else if(IsEqualIID(riid, &IID_IInputObject)) + { + *ppvObject = &This->IInputObject_iface; + } if(*ppvObject) { @@ -1971,6 +1976,67 @@ const INameSpaceTreeControlEventsVtbl vt_INameSpaceTreeControlEvents = { NSTCEvents_fnOnGetDefaultIconIndex }; +/************************************************************************** + * IInputObject Implementation + */ + +static inline ExplorerBrowserImpl *impl_from_IInputObject(IInputObject *iface) +{ + return CONTAINING_RECORD(iface, ExplorerBrowserImpl, IInputObject_iface); +} + +static HRESULT WINAPI IInputObject_fnQueryInterface(IInputObject *iface, + REFIID riid, void **ppvObject) +{ + ExplorerBrowserImpl *This = impl_from_IInputObject(iface); + TRACE("%p\n", This); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppvObject); +} + +static ULONG WINAPI IInputObject_fnAddRef(IInputObject *iface) +{ + ExplorerBrowserImpl *This = impl_from_IInputObject(iface); + TRACE("%p\n", This); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI IInputObject_fnRelease(IInputObject *iface) +{ + ExplorerBrowserImpl *This = impl_from_IInputObject(iface); + TRACE("%p\n", This); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI IInputObject_fnUIActivateIO(IInputObject *iface, BOOL fActivate, MSG *pMsg) +{ + ExplorerBrowserImpl *This = impl_from_IInputObject(iface); + FIXME("stub, %p (%d, %p)\n", This, fActivate, pMsg); + return E_NOTIMPL; +} + +static HRESULT WINAPI IInputObject_fnHasFocusIO(IInputObject *iface) +{ + ExplorerBrowserImpl *This = impl_from_IInputObject(iface); + FIXME("stub, %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI IInputObject_fnTranslateAcceleratorIO(IInputObject *iface, MSG *pMsg) +{ + ExplorerBrowserImpl *This = impl_from_IInputObject(iface); + FIXME("stub, %p (%p)\n", This, pMsg); + return E_NOTIMPL; +} + +static IInputObjectVtbl vt_IInputObject = { + IInputObject_fnQueryInterface, + IInputObject_fnAddRef, + IInputObject_fnRelease, + IInputObject_fnUIActivateIO, + IInputObject_fnHasFocusIO, + IInputObject_fnTranslateAcceleratorIO +}; + HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { ExplorerBrowserImpl *eb; @@ -1990,6 +2056,7 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi eb->ICommDlgBrowser3_iface.lpVtbl = &vt_ICommDlgBrowser3; eb->IObjectWithSite_iface.lpVtbl = &vt_IObjectWithSite; eb->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_INameSpaceTreeControlEvents; + eb->IInputObject_iface.lpVtbl = &vt_IInputObject; /* Default settings */ eb->navpane.width = 150; diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 15c2cb4..a221f97 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1607,6 +1607,114 @@ static void test_GetCurrentView(void) IExplorerBrowser_Release(peb); } +static void test_InputObject(void) +{ + IExplorerBrowser *peb; + IShellFolder *psf; + IInputObject *pio; + HRESULT hr; + RECT rc; + UINT i; + WPARAM supported_key_accels_mode1[] = { + VK_BACK, VK_TAB, VK_RETURN, VK_PRIOR, VK_NEXT, VK_END, VK_HOME, + VK_LEFT, VK_UP, VK_RIGHT, VK_DOWN, VK_DELETE, VK_F1, VK_F2, + VK_F5, VK_F6, VK_F10, 0 }; + WPARAM supported_key_accels_mode2[] = { + VK_RETURN, VK_PRIOR, VK_NEXT, VK_END, VK_HOME, + VK_LEFT, VK_UP, VK_RIGHT, VK_DOWN, VK_DELETE, VK_F1, VK_F2, + VK_F10, 0 }; + WPARAM *key_accels; + MSG msg_a = { + hwnd, + WM_KEYDOWN, + VK_F5, 0, + GetTickCount(), + {5, 2} + }; + + ebrowser_instantiate(&peb); + hr = IExplorerBrowser_QueryInterface(peb, &IID_IInputObject, (void**)&pio); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("IInputObject not supported.\n"); + return; + } + + /* Before initializing */ + hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); + todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + hr = IInputObject_HasFocusIO(pio); + todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + hr = IInputObject_UIActivateIO(pio, TRUE, &msg_a); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IInputObject_HasFocusIO(pio); + todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); + todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + rc.left = 0; rc.top = 0; rc.right = 100; rc.bottom = 100; + hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IInputObject_HasFocusIO(pio); + todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); + todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + /* Browse to the desktop */ + SHGetDesktopFolder(&psf); + hr = IExplorerBrowser_BrowseToObject(peb, (IUnknown*)psf, SBSP_DEFBROWSER); + ok(hr == S_OK, "Got 0x%08x\n", hr); + IShellFolder_Release(psf); + + hr = IInputObject_UIActivateIO(pio, TRUE, &msg_a); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IInputObject_HasFocusIO(pio); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IInputObject_UIActivateIO(pio, FALSE, &msg_a); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IInputObject_HasFocusIO(pio); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); + if(hr == S_OK) + key_accels = supported_key_accels_mode1; + else + key_accels = supported_key_accels_mode2; + + for(i = 0; i < 0x100; i++) + { + BOOL found = FALSE; + UINT j; + for(j = 0; key_accels[j] != 0; j++) + if(key_accels[j] == i) + { + found = TRUE; + break; + } + + msg_a.wParam = i; + process_msgs(); + hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); + todo_wine ok(hr == (found ? S_OK : S_FALSE), "Got 0x%08x (%04x)\n", hr, i); + } + + process_msgs(); + + IInputObject_Release(pio); + IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); +} + static BOOL test_instantiate_control(void) { IExplorerBrowser *peb; @@ -1658,6 +1766,7 @@ START_TEST(ebrowser) test_navigation(); test_GetCurrentView(); test_SetSite(); + test_InputObject(); DestroyWindow(hwnd); OleUninitialize();

1 0

Jacek Caban : mshtml: Get rid of no longer used GECKO_DATADIR.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 75c7d564652fb9fbe8e5a4116a1080e7f3237fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c7d564652fb9fbe8e5a4116… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 23 14:26:13 2010 +0100 mshtml: Get rid of no longer used GECKO_DATADIR. --- dlls/mshtml/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index d805c74..58ef16c 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H -DGECKO_DATADIR="\"$(datadir)\"" +EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet C_SRCS = \

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleDocumentView iface.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 37c3091f27b7df0d619d1bf697b0d560877cf250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c3091f27b7df0d619d1bf69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:19:14 2010 +0100 mshtml: COM cleanup for the IOleDocumentView iface. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/oleobj.c | 14 +++++++------- dlls/mshtml/olewnd.c | 2 +- dlls/mshtml/view.c | 41 +++++++++++++++++++++-------------------- 5 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37c3091f27b7df0d619d1…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleInPlaceActiveObject iface.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: b09dc2e5b144876e6e87b1a1ac554c6fa82e2458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09dc2e5b144876e6e87b1a1a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:20:05 2010 +0100 mshtml: COM cleanup for the IOleInPlaceActiveObject iface. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/olecmd.c | 5 +++-- dlls/mshtml/olewnd.c | 33 +++++++++++++++++---------------- dlls/mshtml/view.c | 8 +++++--- 5 files changed, 28 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b09dc2e5b144876e6e87b…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IViewObjectEx iface.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 176358216f80237ff22e96fd5dd36b25e3f801bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=176358216f80237ff22e96fd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:21:09 2010 +0100 mshtml: COM cleanup for the IViewObjectEx iface. --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/mshtml_private.h | 5 +---- dlls/mshtml/view.c | 39 ++++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5fa5adf..15240de 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1755,13 +1755,13 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleInPlaceActiveObject_iface; }else if(IsEqualGUID(&IID_IViewObject, riid)) { TRACE("(%p)->(IID_IViewObject, %p)\n", This, ppv); - *ppv = VIEWOBJ(This); + *ppv = &This->IViewObjectEx_iface; }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2, %p)\n", This, ppv); - *ppv = VIEWOBJ2(This); + *ppv = &This->IViewObjectEx_iface; }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { TRACE("(%p)->(IID_IViewObjectEx, %p)\n", This, ppv); - *ppv = VIEWOBJEX(This); + *ppv = &This->IViewObjectEx_iface; }else if(IsEqualGUID(&IID_IOleWindow, riid)) { TRACE("(%p)->(IID_IOleWindow, %p)\n", This, ppv); *ppv = &This->IOleInPlaceActiveObject_iface; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f8e808a..703d5ff 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -355,7 +355,7 @@ struct HTMLDocument { IOleDocument IOleDocument_iface; IOleDocumentView IOleDocumentView_iface; IOleInPlaceActiveObject IOleInPlaceActiveObject_iface; - const IViewObjectExVtbl *lpViewObjectExVtbl; + IViewObjectEx IViewObjectEx_iface; const IOleInPlaceObjectWindowlessVtbl *lpOleInPlaceObjectWindowlessVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; @@ -625,9 +625,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectExVtbl) -#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectExVtbl) -#define VIEWOBJEX(x) ((IViewObjectEx*) &(x)->lpViewObjectExVtbl) #define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define INPLACEWIN(x) ((IOleInPlaceObjectWindowless*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index cd716db..1b6a32f 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -759,23 +759,26 @@ static const IOleDocumentViewVtbl OleDocumentViewVtbl = { * IViewObject implementation */ -#define VIEWOBJ_THIS(iface) DEFINE_THIS(HTMLDocument, ViewObjectEx, iface) +static inline HTMLDocument *impl_from_IViewObjectEx(IViewObjectEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IViewObjectEx_iface); +} static HRESULT WINAPI ViewObject_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppv) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI ViewObject_AddRef(IViewObjectEx *iface) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); return htmldoc_addref(This); } static ULONG WINAPI ViewObject_Release(IViewObjectEx *iface) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); return htmldoc_release(This); } @@ -783,7 +786,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue), ULONG_PTR dwContinue) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %ld)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); return E_NOTIMPL; @@ -792,7 +795,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p %p %p)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hicTargetDev, ppColorSet); return E_NOTIMPL; } @@ -800,21 +803,21 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwDrawA static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d)\n", This, dwFreeze); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); TRACE("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink); @@ -832,7 +835,7 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); return E_NOTIMPL; } @@ -840,21 +843,21 @@ static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE* ptd, LPSIZEL lpsizel) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, ptd, lpsizel); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %p)\n", This, dwAspect, pRect); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%p)\n", This, pdwStatus); return E_NOTIMPL; } @@ -862,7 +865,7 @@ static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwS static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx* iface, DWORD dwAspect, LPCRECT pRectBounds, POINT ptlLoc, LONG lCloseHint, DWORD *pHitResult) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %p (%d %d) %d %p)\n", This, dwAspect, pRectBounds, ptlLoc.x, ptlLoc.y, lCloseHint, pHitResult); return E_NOTIMPL; @@ -871,7 +874,7 @@ static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx* iface, DWORD dwAsp static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, LPCRECT pRectLoc, LONG lCloseHint, DWORD *pHitResult) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectLoc, lCloseHint, pHitResult); return E_NOTIMPL; } @@ -879,14 +882,12 @@ static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx *iface, DWORD dwAspe static HRESULT WINAPI ViewObject_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, DVTARGETDEVICE *ptd, HDC hicTargetDev, DVEXTENTINFO *pExtentInfo, LPSIZEL pSizel) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p %p %p\n", This, dwAspect,lindex, ptd, hicTargetDev, pExtentInfo, pSizel); return E_NOTIMPL; } -#undef VIEWOBJ_THIS - static const IViewObjectExVtbl ViewObjectVtbl = { ViewObject_QueryInterface, ViewObject_AddRef, @@ -908,5 +909,5 @@ static const IViewObjectExVtbl ViewObjectVtbl = { void HTMLDocument_View_Init(HTMLDocument *This) { This->IOleDocumentView_iface.lpVtbl = &OleDocumentViewVtbl; - This->lpViewObjectExVtbl = &ViewObjectVtbl; + This->IViewObjectEx_iface.lpVtbl = &ViewObjectVtbl; }

1 0