May 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : shell32: Finish the COM cleanup in shelllink.c.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 4ecd6e793405657b3a4268aa74a7f05e74cae439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecd6e793405657b3a4268aa7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 23 01:05:19 2011 +0200 shell32: Finish the COM cleanup in shelllink.c. --- dlls/shell32/shelllink.c | 84 +++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index a0fe6ce..07fe7aa 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -129,13 +129,13 @@ static const IObjectWithSiteVtbl owsvt; typedef struct { IShellLinkA IShellLinkA_iface; - const IShellLinkWVtbl *lpvtblw; - const IPersistFileVtbl *lpvtblPersistFile; - const IPersistStreamVtbl *lpvtblPersistStream; - const IShellLinkDataListVtbl *lpvtblShellLinkDataList; - const IShellExtInitVtbl *lpvtblShellExtInit; - const IContextMenuVtbl *lpvtblContextMenu; - const IObjectWithSiteVtbl *lpvtblObjectWithSite; + IShellLinkW IShellLinkW_iface; + IPersistFile IPersistFile_iface; + IPersistStream IPersistStream_iface; + IShellLinkDataList IShellLinkDataList_iface; + IShellExtInit IShellExtInit_iface; + IContextMenu IContextMenu_iface; + IObjectWithSite IObjectWithSite_iface; LONG ref; @@ -170,39 +170,39 @@ static inline IShellLinkImpl *impl_from_IShellLinkA(IShellLinkA *iface) return CONTAINING_RECORD(iface, IShellLinkImpl, IShellLinkA_iface); } -static inline IShellLinkImpl *impl_from_IShellLinkW( IShellLinkW *iface ) +static inline IShellLinkImpl *impl_from_IShellLinkW(IShellLinkW *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblw)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IShellLinkW_iface); } -static inline IShellLinkImpl *impl_from_IPersistFile( IPersistFile *iface ) +static inline IShellLinkImpl *impl_from_IPersistFile(IPersistFile *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblPersistFile)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IPersistFile_iface); } -static inline IShellLinkImpl *impl_from_IPersistStream( IPersistStream *iface ) +static inline IShellLinkImpl *impl_from_IPersistStream(IPersistStream *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblPersistStream)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IPersistStream_iface); } -static inline IShellLinkImpl *impl_from_IShellLinkDataList( IShellLinkDataList *iface ) +static inline IShellLinkImpl *impl_from_IShellLinkDataList(IShellLinkDataList *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblShellLinkDataList)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IShellLinkDataList_iface); } -static inline IShellLinkImpl *impl_from_IShellExtInit( IShellExtInit *iface ) +static inline IShellLinkImpl *impl_from_IShellExtInit(IShellExtInit *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblShellExtInit)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IShellExtInit_iface); } -static inline IShellLinkImpl *impl_from_IContextMenu( IContextMenu *iface ) +static inline IShellLinkImpl *impl_from_IContextMenu(IContextMenu *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblContextMenu)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IContextMenu_iface); } -static inline IShellLinkImpl *impl_from_IObjectWithSite( IObjectWithSite *iface ) +static inline IShellLinkImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) { - return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblObjectWithSite)); + return CONTAINING_RECORD(iface, IShellLinkImpl, IObjectWithSite_iface); } static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); @@ -243,31 +243,31 @@ static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid, LPV } else if(IsEqualIID(riid, &IID_IShellLinkW)) { - *ppvObj = &(This->lpvtblw); + *ppvObj = &This->IShellLinkW_iface; } else if(IsEqualIID(riid, &IID_IPersistFile)) { - *ppvObj = &(This->lpvtblPersistFile); + *ppvObj = &This->IPersistFile_iface; } else if(IsEqualIID(riid, &IID_IPersistStream)) { - *ppvObj = &(This->lpvtblPersistStream); + *ppvObj = &This->IPersistStream_iface; } else if(IsEqualIID(riid, &IID_IShellLinkDataList)) { - *ppvObj = &(This->lpvtblShellLinkDataList); + *ppvObj = &This->IShellLinkDataList_iface; } else if(IsEqualIID(riid, &IID_IShellExtInit)) { - *ppvObj = &(This->lpvtblShellExtInit); + *ppvObj = &This->IShellExtInit_iface; } else if(IsEqualIID(riid, &IID_IContextMenu)) { - *ppvObj = &(This->lpvtblContextMenu); + *ppvObj = &This->IContextMenu_iface; } else if(IsEqualIID(riid, &IID_IObjectWithSite)) { - *ppvObj = &(This->lpvtblObjectWithSite); + *ppvObj = &This->IObjectWithSite_iface; } if(*ppvObj) @@ -386,7 +386,7 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface) static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - IPersistStream *StreamThis = (IPersistStream *)&This->lpvtblPersistStream; + IPersistStream *StreamThis = &This->IPersistStream_iface; HRESULT r; IStream *stm; @@ -474,7 +474,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - IPersistStream *StreamThis = (IPersistStream *)&This->lpvtblPersistStream; + IPersistStream *StreamThis = &This->IPersistStream_iface; HRESULT r; IStream *stm; @@ -1263,13 +1263,13 @@ HRESULT WINAPI IShellLink_Constructor( IUnknown *pUnkOuter, sl->ref = 1; sl->IShellLinkA_iface.lpVtbl = &slvt; - sl->lpvtblw = &slvtw; - sl->lpvtblPersistFile = &pfvt; - sl->lpvtblPersistStream = &psvt; - sl->lpvtblShellLinkDataList = &dlvt; - sl->lpvtblShellExtInit = &eivt; - sl->lpvtblContextMenu = &cmvt; - sl->lpvtblObjectWithSite = &owsvt; + sl->IShellLinkW_iface.lpVtbl = &slvtw; + sl->IPersistFile_iface.lpVtbl = &pfvt; + sl->IPersistStream_iface.lpVtbl = &psvt; + sl->IShellLinkDataList_iface.lpVtbl = &dlvt; + sl->IShellExtInit_iface.lpVtbl = &eivt; + sl->IContextMenu_iface.lpVtbl = &cmvt; + sl->IObjectWithSite_iface.lpVtbl = &owsvt; sl->iShowCmd = SW_SHOWNORMAL; sl->bDirty = FALSE; sl->iIdOpen = -1; @@ -1435,7 +1435,7 @@ static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA *iface, LPITEMIDLIST * TRACE("(%p)->(ppidl=%p)\n",This, ppidl); - return IShellLinkW_GetIDList((IShellLinkW*)&(This->lpvtblw), ppidl); + return IShellLinkW_GetIDList(&This->IShellLinkW_iface, ppidl); } static HRESULT WINAPI IShellLinkA_fnSetIDList(IShellLinkA *iface, LPCITEMIDLIST pidl) @@ -1655,7 +1655,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA *iface, HWND hwnd, DWORD TRACE("(%p)->(hwnd=%p flags=%x)\n",This, hwnd, fFlags); - return IShellLinkW_Resolve( (IShellLinkW*)&(This->lpvtblw), hwnd, fFlags ); + return IShellLinkW_Resolve(&This->IShellLinkW_iface, hwnd, fFlags); } static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) @@ -1672,7 +1672,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) if( !str ) return E_OUTOFMEMORY; - r = IShellLinkW_SetPath((IShellLinkW*)&(This->lpvtblw), str); + r = IShellLinkW_SetPath(&This->IShellLinkW_iface, str); HeapFree( GetProcessHeap(), 0, str ); return r; @@ -2392,7 +2392,7 @@ ShellLink_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder, path = HeapAlloc( GetProcessHeap(), 0, count*sizeof(WCHAR) ); if( path ) { - IPersistFile *pf = (IPersistFile*) &This->lpvtblPersistFile; + IPersistFile *pf = &This->IPersistFile_iface; count = DragQueryFileW( stgm.u.hGlobal, 0, path, count ); r = IPersistFile_Load( pf, path, 0 ); @@ -2509,7 +2509,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) return E_INVALIDARG; } - r = IShellLinkW_Resolve( (IShellLinkW*)&(This->lpvtblw), hwnd, 0 ); + r = IShellLinkW_Resolve(&This->IShellLinkW_iface, hwnd, 0); if ( FAILED( r ) ) return r;

1 0

Michael Stefaniuc : shell32: COM cleanup for the IShellLinkA iface.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: d9d74ec327539bddf565c7c41f6d3a4e0d791445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d74ec327539bddf565c7c41… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 23 01:02:05 2011 +0200 shell32: COM cleanup for the IShellLinkA iface. --- dlls/shell32/shelllink.c | 116 +++++++++++++++++++++++++--------------------- 1 files changed, 63 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9d74ec327539bddf565c…

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup in shlview.c.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 3d172c697846a31f735d8218375824cdab0fba50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d172c697846a31f735d82183… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 23 01:00:43 2011 +0200 shell32: Finish the COM cleanup in shlview.c. --- dlls/shell32/shlview.c | 74 ++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ab71f4c..93077d5 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -80,13 +80,13 @@ typedef struct typedef struct { IShellView2 IShellView2_iface; - LONG ref; - const IOleCommandTargetVtbl* lpvtblOleCommandTarget; - const IDropTargetVtbl* lpvtblDropTarget; - const IDropSourceVtbl* lpvtblDropSource; - const IViewObjectVtbl* lpvtblViewObject; - const IFolderViewVtbl* lpvtblFolderView; - const IShellFolderViewVtbl *lpvtblShellFolderView; + IOleCommandTarget IOleCommandTarget_iface; + IDropTarget IDropTarget_iface; + IDropSource IDropSource_iface; + IViewObject IViewObject_iface; + IFolderView IFolderView_iface; + IShellFolderView IShellFolderView_iface; + LONG ref; IShellFolder* pSFParent; IShellFolder2* pSF2Parent; IShellBrowser* pShellBrowser; @@ -125,34 +125,34 @@ static inline IShellViewImpl *impl_from_IShellView2(IShellView2 *iface) return CONTAINING_RECORD(iface, IShellViewImpl, IShellView2_iface); } -static inline IShellViewImpl *impl_from_IOleCommandTarget( IOleCommandTarget *iface ) +static inline IShellViewImpl *impl_from_IOleCommandTarget(IOleCommandTarget *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblOleCommandTarget)); + return CONTAINING_RECORD(iface, IShellViewImpl, IOleCommandTarget_iface); } -static inline IShellViewImpl *impl_from_IDropTarget( IDropTarget *iface ) +static inline IShellViewImpl *impl_from_IDropTarget(IDropTarget *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblDropTarget)); + return CONTAINING_RECORD(iface, IShellViewImpl, IDropTarget_iface); } -static inline IShellViewImpl *impl_from_IDropSource( IDropSource *iface ) +static inline IShellViewImpl *impl_from_IDropSource(IDropSource *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblDropSource)); + return CONTAINING_RECORD(iface, IShellViewImpl, IDropSource_iface); } -static inline IShellViewImpl *impl_from_IViewObject( IViewObject *iface ) +static inline IShellViewImpl *impl_from_IViewObject(IViewObject *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblViewObject)); + return CONTAINING_RECORD(iface, IShellViewImpl, IViewObject_iface); } -static inline IShellViewImpl *impl_from_IFolderView( IFolderView *iface ) +static inline IShellViewImpl *impl_from_IFolderView(IFolderView *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblFolderView)); + return CONTAINING_RECORD(iface, IShellViewImpl, IFolderView_iface); } -static inline IShellViewImpl *impl_from_IShellFolderView( IShellFolderView *iface ) +static inline IShellViewImpl *impl_from_IShellFolderView(IShellFolderView *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblShellFolderView)); + return CONTAINING_RECORD(iface, IShellViewImpl, IShellFolderView_iface); } /* ListView Header ID's */ @@ -207,12 +207,12 @@ IShellView * IShellView_Constructor( IShellFolder * pFolder) sv=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellViewImpl)); sv->ref=1; sv->IShellView2_iface.lpVtbl = &svvt; - sv->lpvtblOleCommandTarget=&ctvt; - sv->lpvtblDropTarget=&dtvt; - sv->lpvtblDropSource=&dsvt; - sv->lpvtblViewObject=&vovt; - sv->lpvtblFolderView=&fviewvt; - sv->lpvtblShellFolderView=&shellfolderviewvt; + sv->IOleCommandTarget_iface.lpVtbl = &ctvt; + sv->IDropTarget_iface.lpVtbl = &dtvt; + sv->IDropSource_iface.lpVtbl = &dsvt; + sv->IViewObject_iface.lpVtbl = &vovt; + sv->IFolderView_iface.lpVtbl = &fviewvt; + sv->IShellFolderView_iface.lpVtbl = &shellfolderviewvt; sv->pSFParent = pFolder; if(pFolder) IShellFolder_AddRef(pFolder); @@ -656,7 +656,7 @@ static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) static HRESULT ShellView_FillList(IShellViewImpl *This) { - IShellFolderView *folderview = (IShellFolderView*)&This->lpvtblShellFolderView; + IShellFolderView *folderview = &This->IShellFolderView_iface; LPENUMIDLIST pEnumIDList; LPITEMIDLIST pidl; DWORD fetched; @@ -1469,7 +1469,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject,0,(LPVOID *)&pda))) { - IDropSource * pds = (IDropSource*)&(This->lpvtblDropSource); /* own DropSource interface */ + IDropSource *pds = &This->IDropSource_iface; /* own DropSource interface */ if (SUCCEEDED(IShellFolder_GetAttributesOf(This->pSFParent, This->cidl, (LPCITEMIDLIST*)This->apidl, &dwAttributes))) { @@ -1746,27 +1746,27 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 *iface, REFIID rii } else if(IsEqualIID(riid, &IID_IShellFolderView)) { - *ppvObj = &This->lpvtblShellFolderView; + *ppvObj = &This->IShellFolderView_iface; } else if(IsEqualIID(riid, &IID_IFolderView)) { - *ppvObj = &This->lpvtblFolderView; + *ppvObj = &This->IFolderView_iface; } else if(IsEqualIID(riid, &IID_IOleCommandTarget)) { - *ppvObj = &This->lpvtblOleCommandTarget; + *ppvObj = &This->IOleCommandTarget_iface; } else if(IsEqualIID(riid, &IID_IDropTarget)) { - *ppvObj = &This->lpvtblDropTarget; + *ppvObj = &This->IDropTarget_iface; } else if(IsEqualIID(riid, &IID_IDropSource)) { - *ppvObj = &This->lpvtblDropSource; + *ppvObj = &This->IDropSource_iface; } else if(IsEqualIID(riid, &IID_IViewObject)) { - *ppvObj = &This->lpvtblViewObject; + *ppvObj = &This->IViewObject_iface; } if(*ppvObj) @@ -2007,7 +2007,7 @@ static HRESULT WINAPI IShellView_fnSaveViewState(IShellView2 *iface) static HRESULT WINAPI IShellView_fnSelectItem(IShellView2 *iface, LPCITEMIDLIST pidl, UINT flags) { IShellViewImpl *This = impl_from_IShellView2(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; int i; TRACE("(%p)->(pidl=%p, 0x%08x)\n",This, pidl, flags); @@ -3021,7 +3021,7 @@ static HRESULT WINAPI IShellFolderView_fnAutoArrange(IShellFolderView *iface) static HRESULT WINAPI IShellFolderView_fnGetAutoArrange(IShellFolderView *iface) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; TRACE("(%p)\n", This); return IFolderView_GetAutoArrange(view); @@ -3043,7 +3043,7 @@ static HRESULT WINAPI IShellFolderView_fnGetObject( UINT item) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; TRACE("(%p)->(%p %d)\n", This, pidl, item); return IFolderView_Item(view, item, pidl); @@ -3077,7 +3077,7 @@ static HRESULT WINAPI IShellFolderView_fnGetObjectCount( UINT *count) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; TRACE("(%p)->(%p)\n", This, count); return IFolderView_ItemCount(view, SVGIO_ALLVIEW, (INT*)count);

1 0

Gerald Pfeifer : iphlpapi: Make addrLen unsigned in getInterfacePhysicalByName.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: c053e6680cc4030184415c82e681cd421c78a9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c053e6680cc4030184415c82e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 22 20:54:45 2011 +0200 iphlpapi: Make addrLen unsigned in getInterfacePhysicalByName. --- dlls/iphlpapi/ifenum.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c998b93..a0d7577 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -473,7 +473,7 @@ static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr u_char *p, *buf; size_t mibLen; int mib[] = { CTL_NET, AF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; - int addrLen; + unsigned addrLen; BOOL found = FALSE; if (!name || !len || !addr || !type)

1 0

Gerald Pfeifer : comctl32/tests: Add casts to avoid comparison of different int types.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 35707aee681c72c4c3f935e1db5dda65b4296c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35707aee681c72c4c3f935e1d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 22 20:51:30 2011 +0200 comctl32/tests: Add casts to avoid comparison of different int types. --- dlls/comctl32/tests/tab.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 8b64764..7f5bbb7 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1313,6 +1313,7 @@ static void test_TCM_SETITEMEXTRA(void) static void test_TCS_OWNERDRAWFIXED(void) { LPARAM lparam, lparam2; + ULONG_PTR itemdata; TCITEMA item; HWND hTab; BOOL ret; @@ -1335,9 +1336,9 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - lparam = 0; - memset(&lparam, 0xde, 4); - ok(g_drawitem.itemData == lparam, "got %lx, expected %lx\n", g_drawitem.itemData, lparam); + itemdata = 0; + memset(&itemdata, 0xde, 4); + ok(g_drawitem.itemData == itemdata, "got %lx, expected %lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab);

1 0

Nikolay Sivov : comctl32/treeview: Correctly draw cut items.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 9bdd21cad579de484b4aff56e8cf244495ea69aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdd21cad579de484b4aff56e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 22 11:29:51 2011 +0400 comctl32/treeview: Correctly draw cut items. --- dlls/comctl32/treeview.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index de4edf5..2388d3c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -33,7 +33,7 @@ * * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, * - * missing item styles: TVIS_CUT, TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, + * missing item styles: TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, * TVIS_EX_DISABLED * * Make the insertion mark look right. @@ -2601,12 +2601,14 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) if (infoPtr->himlNormal) { - int ovlIdx = item->state & TVIS_OVERLAYMASK; + UINT style = item->state & TVIS_CUT ? ILD_SELECTED : ILD_NORMAL; - ImageList_Draw(infoPtr->himlNormal, imageIndex, hdc, - item->imageOffset, - centery - infoPtr->normalImageHeight / 2, - ILD_NORMAL | ovlIdx); + style |= item->state & TVIS_OVERLAYMASK; + + ImageList_DrawEx(infoPtr->himlNormal, imageIndex, hdc, + item->imageOffset, centery - infoPtr->normalImageHeight / 2, + 0, 0, infoPtr->clrBk, item->state & TVIS_CUT ? GETBKCOLOR(infoPtr->clrBk) : CLR_DEFAULT, + style); } }

1 0

Nikolay Sivov : comctl32/treeview: Item text should be vertically aligned.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: a1f7c09b1c0b3dccf05975970d978b5f309049c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f7c09b1c0b3dccf05975970… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 20 11:13:55 2011 +0400 comctl32/treeview: Item text should be vertically aligned. --- dlls/comctl32/treeview.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 490f9b2..de4edf5 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2621,6 +2621,8 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) if (item->pszText) { RECT rcText; + UINT align; + SIZE sz; rcText.top = item->rect.top; rcText.bottom = item->rect.bottom; @@ -2631,19 +2633,22 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) debugstr_w(item->pszText), wine_dbgstr_rect(&rcText)); /* Draw it */ - ExtTextOutW(hdc, rcText.left + 2, rcText.top + 1, + GetTextExtentPoint32W(hdc, item->pszText, strlenW(item->pszText), &sz); + + align = SetTextAlign(hdc, TA_LEFT | TA_TOP); + ExtTextOutW(hdc, rcText.left + 2, (rcText.top + rcText.bottom - sz.cy) / 2, ETO_CLIPPED | ETO_OPAQUE, &rcText, item->pszText, lstrlenW(item->pszText), NULL); - - /* Draw the box around the selected item */ + SetTextAlign(hdc, align); + + /* Draw focus box around the selected item */ if ((item == infoPtr->selectedItem) && inFocus) { DrawFocusRect(hdc,&rcText); } - } }

1 0

Mike Kaplinskiy : iphlpapi: Set the overlapped status to pending as well as returning ERROR_IO_PENDING .
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: e2e98ae36fb6d48583e3977b02d27c4bd1a46882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e98ae36fb6d48583e3977b0… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun May 22 03:22:45 2011 -0400 iphlpapi: Set the overlapped status to pending as well as returning ERROR_IO_PENDING. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 87aa4ac..70b4876 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -49,6 +49,7 @@ #include "winreg.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "winternl.h" #include "ws2ipdef.h" #include "iphlpapi.h" #include "ifenum.h" @@ -2033,6 +2034,7 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); if (Handle) *Handle = INVALID_HANDLE_VALUE; + if (overlapped) ((IO_STATUS_BLOCK *) overlapped)->u.Status = STATUS_PENDING; return ERROR_IO_PENDING; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6f41adf..cd1ef23 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -849,9 +849,9 @@ static void testNotifyAddrChange(void) ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); - todo_wine ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); + ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); ret = GetLastError(); - todo_wine ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); + ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); success = gCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n");

1 0

Michael Stefaniuc : shell32: COM cleanup for the IShellView2 iface.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 7d4dfae2b8014371a06661452eb40a6e3689a343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4dfae2b8014371a06661452… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 23 00:59:00 2011 +0200 shell32: COM cleanup for the IShellView2 iface. --- dlls/shell32/shlview.c | 120 ++++++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d4dfae2b8014371a0666…

1 0

Nikolay Sivov : comctl32/treeview: Always draw a '+' for TVIS_EXPANDPARTIAL state.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 4b741e8d2fc30a908e521615ea3bfb1647ab53f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b741e8d2fc30a908e521615e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 20 10:04:51 2011 +0400 comctl32/treeview: Always draw a '+' for TVIS_EXPANDPARTIAL state. --- dlls/comctl32/treeview.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 42978d2..490f9b2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2453,7 +2453,8 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE MoveToEx(hdc, centerx - plussize + 1, centery, NULL); LineTo(hdc, centerx + plussize, centery); - if (!(item->state & TVIS_EXPANDED)) + if (!(item->state & TVIS_EXPANDED) || + (item->state & TVIS_EXPANDPARTIAL)) { MoveToEx(hdc, centerx, centery - plussize + 1, NULL); LineTo(hdc, centerx, centery + plussize); @@ -2463,8 +2464,9 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE { Rectangle(hdc, centerx - plussize + 1, centery - 1, centerx + plussize, centery + 2); - - if (!(item->state & TVIS_EXPANDED)) + + if (!(item->state & TVIS_EXPANDED) || + (item->state & TVIS_EXPANDPARTIAL)) { Rectangle(hdc, centerx - 1, centery - plussize + 1, centerx + 2, centery + plussize);

1 0