January 2012 - Wine-commits

Nikolay Sivov : shell32: Update to IContextMenu3.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 9fe57a8acf95f0ceaaabfab7ed516f6fa020f4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe57a8acf95f0ceaaabfab7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 04:19:08 2012 +0300 shell32: Update to IContextMenu3. --- dlls/shell32/shlview_cmenu.c | 99 ++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 51 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 1e1b3b0..31db01e 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - IContextMenu2 IContextMenu2_iface; + IContextMenu3 IContextMenu3_iface; LONG ref; IShellFolder* parent; @@ -61,22 +61,23 @@ typedef struct BOOL desktop; } ContextMenu; -static inline ContextMenu *impl_from_IContextMenu2(IContextMenu2 *iface) +static inline ContextMenu *impl_from_IContextMenu3(IContextMenu3 *iface) { - return CONTAINING_RECORD(iface, ContextMenu, IContextMenu2_iface); + return CONTAINING_RECORD(iface, ContextMenu, IContextMenu3_iface); } -static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID riid, LPVOID *ppvObj) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IContextMenu) || - IsEqualIID(riid, &IID_IContextMenu2)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2) || + IsEqualIID(riid, &IID_IContextMenu3)) { *ppvObj = This; } @@ -87,7 +88,7 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu2 *iface, REFIID ri if(*ppvObj) { - IContextMenu2_AddRef(iface); + IContextMenu3_AddRef(iface); return S_OK; } @@ -95,17 +96,17 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu2 *iface, REFIID ri return E_NOINTERFACE; } -static ULONG WINAPI ContextMenu_AddRef(IContextMenu2 *iface) +static ULONG WINAPI ContextMenu_AddRef(IContextMenu3 *iface) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->(%u)\n", This, ref); return ref; } -static ULONG WINAPI ContextMenu_Release(IContextMenu2 *iface) +static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, ref); @@ -125,14 +126,14 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu2 *iface) } static HRESULT WINAPI ItemMenu_QueryContextMenu( - IContextMenu2 *iface, + IContextMenu3 *iface, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); INT uIDMax; TRACE("(%p)->(%p %d 0x%x 0x%x 0x%x )\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -400,10 +401,10 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd) } static HRESULT WINAPI ItemMenu_InvokeCommand( - IContextMenu2 *iface, + IContextMenu3 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) FIXME("Is an EX structure\n"); @@ -485,14 +486,14 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( } static HRESULT WINAPI ItemMenu_GetCommandString( - IContextMenu2 *iface, + IContextMenu3 *iface, UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName, UINT uMaxNameLen) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); HRESULT hr = E_INVALIDARG; TRACE("(%p)->(%lx flags=%x %p name=%p len=%x)\n", This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); @@ -540,18 +541,23 @@ static HRESULT WINAPI ItemMenu_GetCommandString( * should be only in IContextMenu2 and IContextMenu3 * is nevertheless called from word95 */ -static HRESULT WINAPI ItemMenu_HandleMenuMsg( - IContextMenu2 *iface, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static HRESULT WINAPI ContextMenu_HandleMenuMsg(IContextMenu3 *iface, UINT msg, + WPARAM wParam, LPARAM lParam) { - ContextMenu *This = impl_from_IContextMenu2(iface); - TRACE("(%p)->(0x%x 0x%lx 0x%lx)\n", This, uMsg, wParam, lParam); + ContextMenu *This = impl_from_IContextMenu3(iface); + FIXME("(%p)->(0x%x 0x%lx 0x%lx): stub\n", This, msg, wParam, lParam); return E_NOTIMPL; } -static const IContextMenu2Vtbl ItemContextMenuVtbl = +static HRESULT WINAPI ContextMenu_HandleMenuMsg2(IContextMenu3 *iface, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result) +{ + ContextMenu *This = impl_from_IContextMenu3(iface); + FIXME("(%p)->(0x%x 0x%lx 0x%lx %p): stub\n", This, msg, wParam, lParam, result); + return E_NOTIMPL; +} + +static const IContextMenu3Vtbl ItemContextMenuVtbl = { ContextMenu_QueryInterface, ContextMenu_AddRef, @@ -559,7 +565,8 @@ static const IContextMenu2Vtbl ItemContextMenuVtbl = ItemMenu_QueryContextMenu, ItemMenu_InvokeCommand, ItemMenu_GetCommandString, - ItemMenu_HandleMenuMsg + ContextMenu_HandleMenuMsg, + ContextMenu_HandleMenuMsg2 }; IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) @@ -568,7 +575,7 @@ IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, co UINT u; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - This->IContextMenu2_iface.lpVtbl = &ItemContextMenuVtbl; + This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; This->ref = 1; This->verb_offset = 0; This->parent = parent; @@ -586,19 +593,19 @@ IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, co TRACE("(%p)\n", This); - return &This->IContextMenu2_iface; + return (IContextMenu2*)&This->IContextMenu3_iface; } /* Background menu implementation */ static HRESULT WINAPI BackgroundMenu_QueryContextMenu( - IContextMenu2 *iface, + IContextMenu3 *iface, HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); HMENU hMyMenu; UINT idMax; HRESULT hr; @@ -752,10 +759,10 @@ static BOOL DoPaste(ContextMenu *This) } static HRESULT WINAPI BackgroundMenu_InvokeCommand( - IContextMenu2 *iface, + IContextMenu3 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); IShellBrowser *browser; IShellView *view = NULL; HWND hWnd = NULL; @@ -828,14 +835,14 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( } static HRESULT WINAPI BackgroundMenu_GetCommandString( - IContextMenu2 *iface, + IContextMenu3 *iface, UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName, UINT uMaxNameLen) { - ContextMenu *This = impl_from_IContextMenu2(iface); + ContextMenu *This = impl_from_IContextMenu3(iface); TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); @@ -858,18 +865,7 @@ static HRESULT WINAPI BackgroundMenu_GetCommandString( return E_FAIL; } -static HRESULT WINAPI BackgroundMenu_HandleMenuMsg( - IContextMenu2 *iface, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); - return E_NOTIMPL; -} - -static const IContextMenu2Vtbl BackgroundContextMenuVtbl = +static const IContextMenu3Vtbl BackgroundContextMenuVtbl = { ContextMenu_QueryInterface, ContextMenu_AddRef, @@ -877,7 +873,8 @@ static const IContextMenu2Vtbl BackgroundContextMenuVtbl = BackgroundMenu_QueryContextMenu, BackgroundMenu_InvokeCommand, BackgroundMenu_GetCommandString, - BackgroundMenu_HandleMenuMsg + ContextMenu_HandleMenuMsg, + ContextMenu_HandleMenuMsg2 }; IContextMenu2 *BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop) @@ -885,7 +882,7 @@ IContextMenu2 *BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop) ContextMenu *This; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - This->IContextMenu2_iface.lpVtbl = &BackgroundContextMenuVtbl; + This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; This->ref = 1; This->parent = parent; This->verb_offset = 0; @@ -899,5 +896,5 @@ IContextMenu2 *BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop) if (parent) IShellFolder_AddRef(parent); TRACE("(%p)\n", This); - return &This->IContextMenu2_iface; + return (IContextMenu2*)&This->IContextMenu3_iface; }

1 0

Nikolay Sivov : shell32: Avoid pointer casts when background menu is created.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 3efda60ef650af52d6e3aa28e238cf578a9f9063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efda60ef650af52d6e3aa28e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 04:39:24 2012 +0300 shell32: Avoid pointer casts when background menu is created. --- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shfldr_desktop.c | 6 ++++-- dlls/shell32/shlview.c | 10 ++++------ dlls/shell32/shlview_cmenu.c | 11 ++++++++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 4b883fd..3b0fb83 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -79,7 +79,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT, const FORMATETC []) DECLSPEC_HI LPCLASSFACTORY IClassFactory_Constructor(REFCLSID) DECLSPEC_HIDDEN; IContextMenu2 * ItemMenu_Constructor(IShellFolder*, LPCITEMIDLIST, const LPCITEMIDLIST*, UINT) DECLSPEC_HIDDEN; -IContextMenu2 * BackgroundMenu_Constructor(IShellFolder*, BOOL) DECLSPEC_HIDDEN; +HRESULT BackgroundMenu_Constructor(IShellFolder*, BOOL, REFIID, void**) DECLSPEC_HIDDEN; LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER) DECLSPEC_HIDDEN; HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 202a793..ec9ba63 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -530,10 +530,12 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu)) { if (cidl > 0) + { pObj = (LPUNKNOWN) ItemMenu_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl); + hr = S_OK; + } else - pObj = (LPUNKNOWN) BackgroundMenu_Constructor( (IShellFolder *) iface, TRUE); - hr = S_OK; + return BackgroundMenu_Constructor((IShellFolder*)iface, TRUE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 44cbcb6..efd6e0f 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1018,7 +1018,6 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL BOOL fExplore = FALSE; HWND hwndTree = 0; LPCONTEXTMENU pContextMenu = NULL; - IContextMenu2 *pCM = NULL; CMINVOKECOMMANDINFO cmi; TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); @@ -1093,9 +1092,11 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL } else /* background context menu */ { + IContextMenu2 *pCM; + hMenu = CreatePopupMenu(); - pCM = BackgroundMenu_Constructor(This->pSFParent, FALSE); + BackgroundMenu_Constructor(This->pSFParent, FALSE, &IID_IContextMenu2, (void**)&pCM); IContextMenu2_QueryContextMenu(pCM, hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); uCommand = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,This->hWnd,NULL); @@ -2049,10 +2050,7 @@ static HRESULT WINAPI IShellView_fnGetItemObject(IShellView2 *iface, UINT uItem, case SVGIO_BACKGROUND: if (IsEqualIID(&IID_IContextMenu, riid)) - { - *ppvOut = BackgroundMenu_Constructor(This->pSFParent, FALSE); - hr = S_OK; - } + return BackgroundMenu_Constructor(This->pSFParent, FALSE, riid, ppvOut); else FIXME("unsupported interface requested %s\n", debugstr_guid(riid)); diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 31db01e..7833efe 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -877,11 +877,14 @@ static const IContextMenu3Vtbl BackgroundContextMenuVtbl = ContextMenu_HandleMenuMsg2 }; -IContextMenu2 *BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop) +HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID riid, void **pObj) { ContextMenu *This; + HRESULT hr; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; This->ref = 1; This->parent = parent; @@ -895,6 +898,8 @@ IContextMenu2 *BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop) This->desktop = desktop; if (parent) IShellFolder_AddRef(parent); - TRACE("(%p)\n", This); - return (IContextMenu2*)&This->IContextMenu3_iface; + hr = IContextMenu3_QueryInterface(&This->IContextMenu3_iface, riid, pObj); + IContextMenu3_Release(&This->IContextMenu3_iface); + + return hr; }

1 0

Nikolay Sivov : shell32: Avoid casts when creating item menu.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 72a7c34109b9e30cbef4a53a0eb81725dcf278f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a7c34109b9e30cbef4a53a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 05:02:03 2012 +0300 shell32: Avoid casts when creating item menu. --- dlls/shell32/cpanelfolder.c | 3 +-- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shfldr_desktop.c | 5 +---- dlls/shell32/shfldr_fs.c | 4 +--- dlls/shell32/shfldr_mycomp.c | 4 +--- dlls/shell32/shfldr_netplaces.c | 3 +-- dlls/shell32/shfldr_unixfs.c | 5 ++--- dlls/shell32/shlmenu.c | 6 ++++-- dlls/shell32/shlview_cmenu.c | 17 +++++++++++------ 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index bbbd944..fbd1225 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -600,8 +600,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN *ppvOut = NULL; if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl); hr = S_OK; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3b0fb83..88a89a7 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -78,7 +78,7 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST myPidl, LPCIT LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT, const FORMATETC []) DECLSPEC_HIDDEN; LPCLASSFACTORY IClassFactory_Constructor(REFCLSID) DECLSPEC_HIDDEN; -IContextMenu2 * ItemMenu_Constructor(IShellFolder*, LPCITEMIDLIST, const LPCITEMIDLIST*, UINT) DECLSPEC_HIDDEN; +HRESULT ItemMenu_Constructor(IShellFolder*, LPCITEMIDLIST, const LPCITEMIDLIST*, UINT, REFIID, void**) DECLSPEC_HIDDEN; HRESULT BackgroundMenu_Constructor(IShellFolder*, BOOL, REFIID, void**) DECLSPEC_HIDDEN; LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index ec9ba63..43d4108 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -530,10 +530,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu)) { if (cidl > 0) - { - pObj = (LPUNKNOWN) ItemMenu_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; - } + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); else return BackgroundMenu_Constructor((IShellFolder*)iface, TRUE, riid, ppvOut); } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 49c4e7e..3bbe26e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -744,9 +744,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, } if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor ((IShellFolder *) iface, - This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 2482223..200ad86 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -532,9 +532,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor ((IShellFolder *) iface, - This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*) iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index f1fd0e7..39f748b 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -426,8 +426,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 40d4c5c..d22327b 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1165,10 +1165,9 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac if(hr != S_FALSE) return hr; } - + if (IsEqualIID(&IID_IContextMenu, riid)) { - *ppvOut = ItemMenu_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl); - return S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl, riid, ppvOut); } else if (IsEqualIID(&IID_IDataObject, riid)) { *ppvOut = IDataObject_Constructor(hwndOwner, This->m_pidlLocation, apidl, cidl); return S_OK; diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index c3fd055..911feca 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1275,7 +1275,8 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT } else folder_pidl=ILClone(pidlFolder); - system_menu = (IContextMenu*)ItemMenu_Constructor(psf,folder_pidl,(const LPCITEMIDLIST*)apidl,cidl); + + ItemMenu_Constructor(psf, folder_pidl, (const LPCITEMIDLIST*)apidl, cidl, &IID_IContextMenu, (void**)&system_menu); hres= SHELL_CreateContextMenu(hwnd,system_menu,psf,folder_pidl,apidl,cidl,ahkeys,nKeys,&IID_IContextMenu,(void**)ppcm); IContextMenu_Release(system_menu); ILFree(folder_pidl); @@ -1300,7 +1301,8 @@ HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID rii folder_pidl=ILClone(pdcm->pidlFolder); if(pdcm->cKeys==0) FIXME("Loading shell extensions using IQueryAssociations not yet supported\n"); - system_menu = (IContextMenu*)ItemMenu_Constructor(folder,folder_pidl,(const LPCITEMIDLIST*)pdcm->apidl,pdcm->cidl); + + ItemMenu_Constructor(folder, folder_pidl, (const LPCITEMIDLIST*)pdcm->apidl, pdcm->cidl, &IID_IContextMenu, (void**)&system_menu); ret = SHELL_CreateContextMenu(pdcm->hwnd,system_menu,folder,folder_pidl,(LPCITEMIDLIST*)pdcm->apidl,pdcm->cidl,pdcm->aKeys,pdcm->cKeys,riid,ppv); IContextMenu_Release(system_menu); ILFree(folder_pidl); diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 7833efe..b46820c 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -569,12 +569,16 @@ static const IContextMenu3Vtbl ItemContextMenuVtbl = ContextMenu_HandleMenuMsg2 }; -IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) +HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl, + REFIID riid, void **pObj) { ContextMenu* This; - UINT u; + HRESULT hr; + int i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; This->ref = 1; This->verb_offset = 0; @@ -588,12 +592,13 @@ IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, co This->desktop = FALSE; - for(u = 0; u < cidl; u++) - This->allvalues &= (_ILIsValue(apidl[u]) ? 1 : 0); + for (i = 0; i < cidl; i++) + This->allvalues &= (_ILIsValue(apidl[i]) ? 1 : 0); - TRACE("(%p)\n", This); + hr = IContextMenu3_QueryInterface(&This->IContextMenu3_iface, riid, pObj); + IContextMenu3_Release(&This->IContextMenu3_iface); - return (IContextMenu2*)&This->IContextMenu3_iface; + return hr; } /* Background menu implementation */

1 0

Alexandre Julliard : winex11: Move the clipboard DIB creation functions to clipboard.c.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 49b73d53cfe55f69c2c8a9aff40f89658d472ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b73d53cfe55f69c2c8a9aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:41:03 2012 +0100 winex11: Move the clipboard DIB creation functions to clipboard.c. --- dlls/winex11.drv/clipboard.c | 202 +++++++++++++++++++++++++++++++++++---- dlls/winex11.drv/dib.c | 219 ------------------------------------------ dlls/winex11.drv/x11drv.h | 4 - 3 files changed, 184 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49b73d53cfe55f69c2c8a…

1 0

Alexandre Julliard : winex11: Avoid using DIB functions to create the dithering image.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 978c42feb5efcee2a0dbf7af9ecba5284a0746e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978c42feb5efcee2a0dbf7af9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:29:47 2012 +0100 winex11: Avoid using DIB functions to create the dithering image. --- dlls/winex11.drv/brush.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index afc1e0b..216c142 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -112,17 +112,21 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) Pixmap pixmap; GC gc = get_bitmap_gc(depth); + wine_tsx11_lock(); if (!ditherImage) { - ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, depth ); - if (!ditherImage) + ditherImage = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, + NULL, MATRIX_SIZE, MATRIX_SIZE, 32, 0 ); + if (!ditherImage) { + wine_tsx11_unlock(); ERR("Could not create dither image\n"); return 0; } + ditherImage->data = HeapAlloc( GetProcessHeap(), 0, + ditherImage->height * ditherImage->bytes_per_line ); } - wine_tsx11_lock(); if (color != prevColor) { int r = GetRValue( color ) * DITHER_LEVELS;

1 0

Alexandre Julliard : winex11: Get rid of the DIB section support.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 5b11c96fa129953b6059e9715851be2e9ec1d7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b11c96fa129953b6059e9715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:18:05 2012 +0100 winex11: Get rid of the DIB section support. --- dlls/winex11.drv/Makefile.in | 4 - dlls/winex11.drv/bitmap.c | 5 - dlls/winex11.drv/dib.c | 3978 --------------------------------------- dlls/winex11.drv/dib_convert.c | 1428 -------------- dlls/winex11.drv/dib_dst_swap.c | 1569 --------------- dlls/winex11.drv/dib_src_swap.c | 1518 --------------- dlls/winex11.drv/x11drv.h | 160 -- dlls/winex11.drv/xrender.c | 44 - 8 files changed, 0 insertions(+), 8706 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b11c96fa129953b6059e…

1 0

Alexandre Julliard : winex11: Remove the global XRender installed flag.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: a680644da62cc7d213183cbae7b2c707d9d38e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a680644da62cc7d213183cbae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:49:39 2012 +0100 winex11: Remove the global XRender installed flag. --- dlls/winex11.drv/xrender.c | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index eec1525..fb567de 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xrender); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static BOOL X11DRV_XRender_Installed = FALSE; - #include <X11/Xlib.h> #include <X11/extensions/Xrender.h> @@ -364,6 +362,7 @@ static int load_xrender_formats(void) const struct gdi_dc_funcs *X11DRV_XRender_Init(void) { int event_base, i; + BOOL ok; using_client_side_fonts = client_side_with_render || client_side_with_core; @@ -395,9 +394,9 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) #undef LOAD_FUNCPTR wine_tsx11_lock(); - X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); + ok = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); wine_tsx11_unlock(); - if (!X11DRV_XRender_Installed) return NULL; + if (!ok) return NULL; TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); if(!load_xrender_formats()) /* This fails in buggy versions of libXrender.so */ @@ -405,14 +404,12 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) ERR_(winediag)("Wine has detected that you probably have a buggy version " "of libXrender. Because of this client side font rendering " "will be disabled. Please upgrade this library.\n"); - X11DRV_XRender_Installed = FALSE; return NULL; } if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) { WARN("one or more of the colour masks are 0, disabling XRENDER. Try running in 16-bit mode or higher.\n"); - X11DRV_XRender_Installed = FALSE; return NULL; } @@ -897,7 +894,7 @@ static AA_Type get_antialias_type( HDC hdc, BOOL subpixel, BOOL hinter ) WORD flags; UINT font_smoothing_type, font_smoothing_orientation; - if (X11DRV_XRender_Installed && subpixel && + if (subpixel && SystemParametersInfoW( SPI_GETFONTSMOOTHINGTYPE, 0, &font_smoothing_type, 0) && font_smoothing_type == FE_FONTSMOOTHINGCLEARTYPE) { @@ -1072,9 +1069,6 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) } if (!font_smoothing) entry->aa_default = AA_None; - - /* we can't support subpixel without xrender */ - if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey; } else entry->aa_default = AA_None; @@ -1699,7 +1693,7 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, int render_op = PictOpOver; XRenderColor col; - if (!X11DRV_XRender_Installed || !physdev->x11dev->has_gdi_font) + if (!physdev->x11dev->has_gdi_font) { dev = GET_NEXT_PHYSDEV( dev, pExtTextOut ); return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); @@ -2133,8 +2127,6 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); } - if (!X11DRV_XRender_Installed) goto x11drv_fallback; - /* XRender is of no use for color -> mono */ if (physdev_dst->format == WXR_FORMAT_MONO && physdev_src->format != WXR_FORMAT_MONO) goto x11drv_fallback; @@ -2197,8 +2189,6 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA Picture src_pict, mask_pict = 0; BOOL use_repeat; - if (!X11DRV_XRender_Installed) goto x11drv_fallback; - if (hbitmap) { if (!(bitmap = X11DRV_get_phys_bitmap( hbitmap ))) return ERROR_INVALID_HANDLE; @@ -2310,12 +2300,6 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct Pixmap src_pixmap; BOOL use_repeat; - if (!X11DRV_XRender_Installed) - { - dev = GET_NEXT_PHYSDEV( dev, pBlendImage ); - return dev->funcs->pBlendImage( dev, info, bits, src, dst, func ); - } - format = get_xrender_format_from_bitmapinfo( info ); if (!(func.AlphaFormat & AC_SRC_ALPHA)) format = get_format_without_alpha( format ); @@ -2385,7 +2369,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, double xscale, yscale; BOOL use_repeat; - if (!X11DRV_XRender_Installed || src_dev->funcs != dst_dev->funcs) + if (src_dev->funcs != dst_dev->funcs) { dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); @@ -2484,7 +2468,6 @@ static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG n const GRADIENT_RECT *rect = grad_array; POINT pt[2]; - if (!X11DRV_XRender_Installed) goto fallback; if (!pXRenderCreateLinearGradient) goto fallback; /* <= 16-bpp uses dithering */ @@ -2582,7 +2565,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b Picture src_pict, dst_pict; XRenderPictureAttributes pa; - if (!X11DRV_XRender_Installed) goto x11drv_fallback; if (!pattern) goto x11drv_fallback; if (physdev->format == WXR_FORMAT_MONO) goto x11drv_fallback;

1 0

Alexandre Julliard : winex11: Create XRender colors from the original COLORREF and add support for PALETTEINDEX colors .
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 7d447d7b9a8b27448a68dd335fd7b5e7d9576e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d447d7b9a8b27448a68dd335… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 20:54:40 2012 +0100 winex11: Create XRender colors from the original COLORREF and add support for PALETTEINDEX colors. --- dlls/winex11.drv/xrender.c | 83 +++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index fb567de..5f73865 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -453,24 +453,32 @@ sym_not_found: } /* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */ -static void get_xrender_color( XRenderPictFormat *pf, int src_color, XRenderColor *dst_color ) +static void get_xrender_color( struct xrender_physdev *physdev, COLORREF src_color, XRenderColor *dst_color ) { - if(pf->direct.redMask) - dst_color->red = ((src_color >> pf->direct.red) & pf->direct.redMask) * 65535/pf->direct.redMask; - else - dst_color->red = 0; + if (src_color & (1 << 24)) /* PALETTEINDEX */ + { + HPALETTE pal = GetCurrentObject( physdev->dev.hdc, OBJ_PAL ); + PALETTEENTRY pal_ent; - if(pf->direct.greenMask) - dst_color->green = ((src_color >> pf->direct.green) & pf->direct.greenMask) * 65535/pf->direct.greenMask; + if (!GetPaletteEntries( pal, LOWORD(src_color), 1, &pal_ent )) + GetPaletteEntries( pal, 0, 1, &pal_ent ); + dst_color->red = pal_ent.peRed * 257; + dst_color->green = pal_ent.peGreen * 257; + dst_color->blue = pal_ent.peBlue * 257; + } else - dst_color->green = 0; + { + if (src_color >> 16 == 0x10ff) src_color = 0; /* DIBINDEX */ - if(pf->direct.blueMask) - dst_color->blue = ((src_color >> pf->direct.blue) & pf->direct.blueMask) * 65535/pf->direct.blueMask; - else - dst_color->blue = 0; + dst_color->red = GetRValue( src_color ) * 257; + dst_color->green = GetGValue( src_color ) * 257; + dst_color->blue = GetBValue( src_color ) * 257; + } - dst_color->alpha = 0xffff; + if (physdev->format == WXR_FORMAT_MONO && !dst_color->red && !dst_color->green && !dst_color->blue) + dst_color->alpha = 0; + else + dst_color->alpha = 0xffff; } static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) @@ -1681,10 +1689,8 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); - XGCValues xgcval; gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; - int textPixel, backgroundPixel; AA_Type aa_type = AA_None; unsigned int idx; Picture pict, tile_pict = 0; @@ -1699,33 +1705,26 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); } - xgcval.function = GXcopy; - xgcval.background = physdev->x11dev->backgroundPixel; - xgcval.fill_style = FillSolid; - wine_tsx11_lock(); - XChangeGC( gdi_display, physdev->x11dev->gc, GCFunction | GCBackground | GCFillStyle, &xgcval ); - wine_tsx11_unlock(); - - if(physdev->x11dev->depth == 1) { - if((physdev->x11dev->textPixel & 0xffffff) == 0) { - textPixel = 0; - backgroundPixel = 1; - } else { - textPixel = 1; - backgroundPixel = 0; - } - } else { - textPixel = physdev->x11dev->textPixel; - backgroundPixel = physdev->x11dev->backgroundPixel; - } + get_xrender_color( physdev, GetTextColor( physdev->dev.hdc ), &col ); + pict = get_xrender_picture( physdev, 0, (flags & ETO_CLIPPED) ? lprect : NULL ); if(flags & ETO_OPAQUE) { + XRenderColor bg; + + if (physdev->format == WXR_FORMAT_MONO) + /* use the inverse of the text color */ + bg.red = bg.green = bg.blue = bg.alpha = ~col.alpha; + else + get_xrender_color( physdev, GetBkColor( physdev->dev.hdc ), &bg ); + wine_tsx11_lock(); - XSetForeground( gdi_display, physdev->x11dev->gc, backgroundPixel ); - XFillRectangle( gdi_display, physdev->x11dev->drawable, physdev->x11dev->gc, - physdev->x11dev->dc_rect.left + lprect->left, physdev->x11dev->dc_rect.top + lprect->top, - lprect->right - lprect->left, lprect->bottom - lprect->top ); + set_xrender_transformation( pict, 1, 1, 0, 0 ); + pXRenderFillRectangle( gdi_display, PictOpSrc, pict, &bg, + physdev->x11dev->dc_rect.left + lprect->left, + physdev->x11dev->dc_rect.top + lprect->top, + lprect->right - lprect->left, + lprect->bottom - lprect->top ); wine_tsx11_unlock(); } @@ -1758,7 +1757,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, physdev->x11dev->dc_rect.left + x, physdev->x11dev->dc_rect.top + y); elts = HeapAlloc(GetProcessHeap(), 0, sizeof(XGlyphElt16) * count); - pict = get_xrender_picture( physdev, 0, (flags & ETO_CLIPPED) ? lprect : NULL ); /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first @@ -1769,12 +1767,11 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, offset.x = offset.y = 0; current.x = current.y = 0; - get_xrender_color(physdev->pict_format, physdev->x11dev->textPixel, &col); tile_pict = get_tile_pict(physdev->format, &col); /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. */ - if((physdev->format == WXR_FORMAT_MONO) && (textPixel == 0)) + if (physdev->format == WXR_FORMAT_MONO && col.red == 0 && col.green == 0 && col.blue == 0) render_op = PictOpOutReverse; /* This gives us 'black' text */ for(idx = 0; idx < count; idx++) @@ -2027,8 +2024,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { XRenderColor fg, bg; - get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->textPixel, &fg ); - get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->backgroundPixel, &bg ); + get_xrender_color( physdev_dst, GetTextColor( physdev_dst->dev.hdc ), &fg ); + get_xrender_color( physdev_dst, GetBkColor( physdev_dst->dev.hdc ), &bg ); fg.alpha = bg.alpha = 0; xrender_mono_blit( src_pict, dst_pict, physdev_dst->format, &fg, &bg,

1 0

Alexandre Julliard : winex11: Avoid some references to the X11 device from XRender.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 3e85a7c2a73ac5fdb578424679905846dfe783b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e85a7c2a73ac5fdb57842467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 20:26:26 2012 +0100 winex11: Avoid some references to the X11 device from XRender. --- dlls/winex11.drv/xrender.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5f73865..27b69ae 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -158,6 +158,7 @@ struct xrender_physdev { struct gdi_physdev dev; X11DRV_PDEVICE *x11dev; + HRGN region; enum wxr_format format; int cache_index; BOOL update_clip; @@ -622,29 +623,29 @@ static Picture get_xrender_picture( struct xrender_physdev *dev, HRGN clip_rgn, wine_tsx11_unlock(); TRACE( "Allocing pict=%lx dc=%p drawable=%08lx\n", dev->pict, dev->dev.hdc, dev->x11dev->drawable ); - dev->update_clip = (dev->x11dev->region != 0); + dev->update_clip = (dev->region != 0); } if (clip_rect) { HRGN rgn = CreateRectRgnIndirect( clip_rect ); if (clip_rgn) CombineRgn( rgn, rgn, clip_rgn, RGN_AND ); - if (dev->x11dev->region) CombineRgn( rgn, rgn, dev->x11dev->region, RGN_AND ); + if (dev->region) CombineRgn( rgn, rgn, dev->region, RGN_AND ); update_xrender_clipping( dev, rgn ); DeleteObject( rgn ); } else if (clip_rgn) { - if (dev->x11dev->region) + if (dev->region) { HRGN rgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( rgn, clip_rgn, dev->x11dev->region, RGN_AND ); + CombineRgn( rgn, clip_rgn, dev->region, RGN_AND ); update_xrender_clipping( dev, rgn ); DeleteObject( rgn ); } else update_xrender_clipping( dev, clip_rgn ); } - else if (dev->update_clip) update_xrender_clipping( dev, dev->x11dev->region ); + else if (dev->update_clip) update_xrender_clipping( dev, dev->region ); dev->update_clip = (clip_rect || clip_rgn); /* have to update again if we are using a custom region */ return dev->pict; @@ -1361,6 +1362,7 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); + physdev->region = rgn; physdev->update_clip = TRUE; dev = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); @@ -2033,7 +2035,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } else /* color -> color (can be at different depths) or mono -> mono */ { - if (physdev_dst->x11dev->depth == 32 && physdev_src->x11dev->depth < 32) + if (physdev_dst->pict_format->depth == 32 && physdev_src->pict_format->depth < 32) mask_pict = get_no_alpha_mask(); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, @@ -2148,7 +2150,7 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); XSetGraphicsExposures( gdi_display, tmpGC, False ); tmp_pixmap = XCreatePixmap( gdi_display, root_window, tmp.visrect.right - tmp.visrect.left, - tmp.visrect.bottom - tmp.visrect.top, physdev_dst->x11dev->depth ); + tmp.visrect.bottom - tmp.visrect.top, physdev_dst->pict_format->depth ); wine_tsx11_unlock(); xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, &tmp ); @@ -2244,8 +2246,10 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA gc = XCreateGC( gdi_display, physdev->x11dev->drawable, 0, NULL ); XSetSubwindowMode( gdi_display, gc, IncludeInferiors ); XSetGraphicsExposures( gdi_display, gc, False ); - tmp_pixmap = XCreatePixmap( gdi_display, root_window, tmp.visrect.right - tmp.visrect.left, - tmp.visrect.bottom - tmp.visrect.top, physdev->x11dev->depth ); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, + tmp.visrect.right - tmp.visrect.left, + tmp.visrect.bottom - tmp.visrect.top, + physdev->pict_format->depth ); wine_tsx11_unlock(); xrender_put_image( src_pixmap, src_pict, mask_pict, NULL, physdev->pict_format,

1 0

Alexandre Julliard : winex11: Store the XRender format in the bitmap structure.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 5112699a6b55971f4e1051518c9e706033813596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5112699a6b55971f4e1051518… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 20:19:56 2012 +0100 winex11: Store the XRender format in the bitmap structure. --- dlls/winex11.drv/bitmap.c | 35 +++++++++++-------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 80 ++++++++++++++++++++------------------------ 3 files changed, 58 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5112699a6b55971f4e105…

1 0