May 2015 - Wine-commits - list.winehq.org

Francois Gouget : ole32: Reorder storage32 functions to avoid forward declarations.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 356748e6bca6e79b6e5f89fea1fabb1a595a38f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=356748e6bca6e79b6e5f89fea… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 23:52:44 2015 +0200 ole32: Reorder storage32 functions to avoid forward declarations. --- dlls/ole32/storage32.c | 12253 +++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 42 +- 2 files changed, 6107 insertions(+), 6188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=356748e6bca6e79b6e5f8…

1 0

Francois Gouget : ole32: Make some storage32 functions static.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 514345b401e611a77a2c06f44143b284754fc4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514345b401e611a77a2c06f44… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 23:52:48 2015 +0200 ole32: Make some storage32 functions static. --- dlls/ole32/storage32.c | 96 ++++++++++++++++++++++++++++++++++----- dlls/ole32/storage32.h | 120 ------------------------------------------------- 2 files changed, 85 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=514345b401e611a77a2c0…

1 0

Nikolay Sivov : explorer: Added IDispatch support for ShellBrowserWindow instance.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 58775c878ae7907812824628c5320f9a0239fdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58775c878ae7907812824628c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 09:13:27 2015 +0300 explorer: Added IDispatch support for ShellBrowserWindow instance. --- dlls/shell32/tests/shelldispatch.c | 8 +-- programs/explorer/Makefile.in | 2 +- programs/explorer/desktop.c | 110 ++++++++++++++++++++++++++++++++----- 3 files changed, 101 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 7c705d4..14e04c8 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -524,21 +524,19 @@ todo_wine { /* IDispatch-related tests */ count = 10; hr = IDispatch_GetTypeInfoCount(disp, &count); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 1, "got %u\n", count); -} + hr = IDispatch_GetTypeInfo(disp, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&typeattr->guid, &IID_IWebBrowser2), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo_Release(typeinfo); -} + /* IWebBrowser2 */ hr = IDispatch_QueryInterface(disp, &IID_IWebBrowser2, (void**)&wb); ok(hr == S_OK, "got 0x%08x\n", hr); diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index b32b869..a06887c 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,7 +1,7 @@ MODULE = explorer.exe APPMODE = -mwindows -municode IMPORTS = rpcrt4 user32 gdi32 advapi32 -DELAYIMPORTS = comctl32 shell32 ole32 shlwapi +DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi C_SRCS = \ appbar.c \ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 3f899e4..b83d772 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -65,6 +65,66 @@ static int desktop_width, launcher_size, launchers_per_row; static struct launcher **launchers; static unsigned int nb_launchers, nb_allocated; +static REFIID tid_ids[] = +{ + &IID_NULL, + &IID_IWebBrowser2 +}; + +typedef enum +{ + NULL_tid, + IWebBrowser2_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hres)) + { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if (InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if (!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if (InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + struct shellwindows { IShellWindows IShellWindows_iface; @@ -1246,19 +1306,17 @@ static ULONG WINAPI webbrowser_Release(IWebBrowser2 *iface) static HRESULT WINAPI webbrowser_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - - FIXME("(%p)->(%p): stub\n", This, pctinfo); - - *pctinfo = 0; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI webbrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid, LPTYPEINFO *ppTInfo) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %d %p): stub\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWebBrowser2_tid, ppTInfo); } static HRESULT WINAPI webbrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, @@ -1266,20 +1324,46 @@ static HRESULT WINAPI webbrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s %p %d %d %p): stub\n", This, debugstr_guid(riid), rgszNames, cNames, + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI webbrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExepInfo, UINT *puArgErr) + EXCEPINFO *pExcepInfo, UINT *puArgErr) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %s %d %08x %p %p %p %p): stub\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWebBrowser2_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } /* IWebBrowser methods */

1 0

Nikolay Sivov : explorer: Implement Application property.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 68c5fed5cc0b9e648f1a72074c13b15e0c87bed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c5fed5cc0b9e648f1a72074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 09:19:38 2015 +0300 explorer: Implement Application property. --- dlls/shell32/tests/shelldispatch.c | 4 +--- programs/explorer/desktop.c | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 14e04c8..3d238f0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -546,11 +546,9 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_get_Application(wb, &app); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(disp == app, "got %p, %p\n", app, disp); -} - if (hr == S_OK) IDispatch_Release(app); + IDispatch_Release(app); hr = IWebBrowser2_get_Document(wb, &doc); todo_wine diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index b83d772..62a07f4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1430,8 +1430,13 @@ static HRESULT WINAPI webbrowser_Stop(IWebBrowser2 *iface) static HRESULT WINAPI webbrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = (IDispatch*)iface; + IDispatch_AddRef(*ppDisp); + + return S_OK; } static HRESULT WINAPI webbrowser_get_Parent(IWebBrowser2 *iface, IDispatch **ppDisp)

1 0

Nikolay Sivov : explorer: Added stub IServiceProvider support for shell browser window.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 3c7bf0350a1df45f6bbe52cdb631ebb6b49ca11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7bf0350a1df45f6bbe52cdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 12:00:54 2015 +0300 explorer: Added stub IServiceProvider support for shell browser window. --- dlls/shell32/tests/shelldispatch.c | 6 +++--- programs/explorer/desktop.c | 44 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3d238f0..84d6246 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -572,12 +572,12 @@ if (hr == S_OK) { ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IServiceProvider, (void**)&sp); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - +if (hr == S_OK) { hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(sb == sb2, "got %p, %p\n", sb, sb2); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 62a07f4..4c7bcd4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -139,6 +139,7 @@ struct shellwindows struct shellbrowserwindow { IWebBrowser2 IWebBrowser2_iface; + IServiceProvider IServiceProvider_iface; }; static struct shellwindows shellwindows; @@ -154,6 +155,11 @@ static inline struct shellbrowserwindow *impl_from_IWebBrowser2(IWebBrowser2 *if return CONTAINING_RECORD(iface, struct shellbrowserwindow, IWebBrowser2_iface); } +static inline struct shellbrowserwindow *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, struct shellbrowserwindow, IServiceProvider_iface); +} + static void shellwindows_init(void); static void desktopshellbrowserwindow_init(void); @@ -1281,6 +1287,10 @@ static HRESULT WINAPI webbrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid { *ppv = &This->IWebBrowser2_iface; } + else if (IsEqualGUID(&IID_IServiceProvider, riid)) + { + *ppv = &This->IServiceProvider_iface; + } if (*ppv) { @@ -1908,9 +1918,43 @@ static const IWebBrowser2Vtbl webbrowser2vtbl = webbrowser_put_Resizable }; +static HRESULT WINAPI serviceprovider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + return IWebBrowser2_QueryInterface(&This->IWebBrowser2_iface, riid, ppv); +} + +static ULONG WINAPI serviceprovider_AddRef(IServiceProvider *iface) +{ + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI serviceprovider_Release(IServiceProvider *iface) +{ + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); +} + +static HRESULT WINAPI serviceprovider_QueryService(IServiceProvider *iface, REFGUID service, + REFIID riid, void **ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(service), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static const IServiceProviderVtbl serviceprovidervtbl = +{ + serviceprovider_QueryInterface, + serviceprovider_AddRef, + serviceprovider_Release, + serviceprovider_QueryService +}; + static void desktopshellbrowserwindow_init(void) { desktopshellbrowserwindow.IWebBrowser2_iface.lpVtbl = &webbrowser2vtbl; + desktopshellbrowserwindow.IServiceProvider_iface.lpVtbl = &serviceprovidervtbl; } static void shellwindows_init(void)

1 0

Nikolay Sivov : explorer: Return IShellBrowser in response to SID_STopLevelBrowser.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: eeabe96abb32bf8c33d85293b098afc391709783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeabe96abb32bf8c33d85293b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 13:07:45 2015 +0300 explorer: Return IShellBrowser in response to SID_STopLevelBrowser. --- dlls/shell32/tests/shelldispatch.c | 21 ++++- programs/explorer/desktop.c | 166 ++++++++++++++++++++++++++++++++++++- 2 files changed, 183 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 84d6246..ba246f1 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -575,12 +575,28 @@ if (hr == S_OK) { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(sb == sb2, "got %p, %p\n", sb, sb2); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IOleWindow, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(unk); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IExplorerBrowser, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IShellBrowser_QueryInterface(sb, &IID_IExplorerBrowser, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IShellBrowser_QueryInterface(sb, &IID_IWebBrowser2, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IShellBrowser_QueryInterface(sb, &IID_IDispatch, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + IShellBrowser_Release(sb2); IShellBrowser_Release(sb); @@ -596,7 +612,6 @@ if (hr == S_OK) { ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); IServiceProvider_Release(sp); -} IDispatch_Release(disp); } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c7bcd4..03008f4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -140,6 +140,7 @@ struct shellbrowserwindow { IWebBrowser2 IWebBrowser2_iface; IServiceProvider IServiceProvider_iface; + IShellBrowser IShellBrowser_iface; }; static struct shellwindows shellwindows; @@ -160,6 +161,11 @@ static inline struct shellbrowserwindow *impl_from_IServiceProvider(IServiceProv return CONTAINING_RECORD(iface, struct shellbrowserwindow, IServiceProvider_iface); } +static inline struct shellbrowserwindow *impl_from_IShellBrowser(IShellBrowser *iface) +{ + return CONTAINING_RECORD(iface, struct shellbrowserwindow, IShellBrowser_iface); +} + static void shellwindows_init(void); static void desktopshellbrowserwindow_init(void); @@ -1939,7 +1945,14 @@ static ULONG WINAPI serviceprovider_Release(IServiceProvider *iface) static HRESULT WINAPI serviceprovider_QueryService(IServiceProvider *iface, REFGUID service, REFIID riid, void **ppv) { - FIXME("%s %s %p\n", debugstr_guid(service), debugstr_guid(riid), ppv); + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + + TRACE("%s %s %p\n", debugstr_guid(service), debugstr_guid(riid), ppv); + + if (IsEqualGUID(service, &SID_STopLevelBrowser)) + return IShellBrowser_QueryInterface(&This->IShellBrowser_iface, riid, ppv); + + WARN("unknown service id %s\n", debugstr_guid(service)); return E_NOTIMPL; } @@ -1951,10 +1964,161 @@ static const IServiceProviderVtbl serviceprovidervtbl = serviceprovider_QueryService }; +/* IShellBrowser */ +static HRESULT WINAPI shellbrowser_QueryInterface(IShellBrowser *iface, REFIID riid, void **ppv) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (IsEqualGUID(&IID_IShellBrowser, riid) || + IsEqualGUID(&IID_IOleWindow, riid) || + IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI shellbrowser_AddRef(IShellBrowser *iface) +{ + struct shellbrowserwindow *This = impl_from_IShellBrowser(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI shellbrowser_Release(IShellBrowser *iface) +{ + struct shellbrowserwindow *This = impl_from_IShellBrowser(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); +} + +static HRESULT WINAPI shellbrowser_GetWindow(IShellBrowser *iface, HWND *phwnd) +{ + FIXME("%p\n", phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_ContextSensitiveHelp(IShellBrowser *iface, BOOL mode) +{ + FIXME("%d\n", mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_InsertMenusSB(IShellBrowser *iface, HMENU hmenuShared, + OLEMENUGROUPWIDTHS *menuwidths) +{ + FIXME("%p %p\n", hmenuShared, menuwidths); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetMenuSB(IShellBrowser *iface, HMENU hmenuShared, + HOLEMENU holemenuReserved, HWND hwndActiveObject) +{ + FIXME("%p %p %p\n", hmenuShared, holemenuReserved, hwndActiveObject); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_RemoveMenusSB(IShellBrowser *iface, HMENU hmenuShared) +{ + FIXME("%p\n", hmenuShared); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetStatusTextSB(IShellBrowser *iface, LPCOLESTR text) +{ + FIXME("%s\n", debugstr_w(text)); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_EnableModelessSB(IShellBrowser *iface, BOOL enable) +{ + FIXME("%d\n", enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_TranslateAcceleratorSB(IShellBrowser *iface, MSG *pmsg, WORD wID) +{ + FIXME("%p 0x%x\n", pmsg, wID); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_BrowseObject(IShellBrowser *iface, LPCITEMIDLIST pidl, UINT flags) +{ + FIXME("%p %x\n", pidl, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetViewStateStream(IShellBrowser *iface, DWORD mode, IStream **stream) +{ + FIXME("0x%x %p\n", mode, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) +{ + FIXME("%d %p\n", id, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, + WPARAM wParam, LPARAM lParam, LRESULT *pret) +{ + FIXME("%d %d %lx %lx %p\n", id, uMsg, wParam, lParam, pret); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_QueryActiveShellView(IShellBrowser *iface, IShellView **view) +{ + FIXME("%p\n", view); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_OnViewWindowActive(IShellBrowser *iface, IShellView *view) +{ + FIXME("%p\n", view); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetToolbarItems(IShellBrowser *iface, LPTBBUTTONSB buttons, + UINT count, UINT flags) +{ + FIXME("%p %d 0x%x\n", buttons, count, flags); + return E_NOTIMPL; +} + +static const IShellBrowserVtbl shellbrowservtbl = { + shellbrowser_QueryInterface, + shellbrowser_AddRef, + shellbrowser_Release, + shellbrowser_GetWindow, + shellbrowser_ContextSensitiveHelp, + shellbrowser_InsertMenusSB, + shellbrowser_SetMenuSB, + shellbrowser_RemoveMenusSB, + shellbrowser_SetStatusTextSB, + shellbrowser_EnableModelessSB, + shellbrowser_TranslateAcceleratorSB, + shellbrowser_BrowseObject, + shellbrowser_GetViewStateStream, + shellbrowser_GetControlWindow, + shellbrowser_SendControlMsg, + shellbrowser_QueryActiveShellView, + shellbrowser_OnViewWindowActive, + shellbrowser_SetToolbarItems +}; + static void desktopshellbrowserwindow_init(void) { desktopshellbrowserwindow.IWebBrowser2_iface.lpVtbl = &webbrowser2vtbl; desktopshellbrowserwindow.IServiceProvider_iface.lpVtbl = &serviceprovidervtbl; + desktopshellbrowserwindow.IShellBrowser_iface.lpVtbl = &shellbrowservtbl; } static void shellwindows_init(void)

1 0

Nikolay Sivov : shell32: Better handle creation/ destruction of shellview window.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 23d546157aa8bfd4cd9779d3041dcaa8a3ddef56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d546157aa8bfd4cd9779d30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 3 19:52:02 2015 +0300 shell32: Better handle creation/destruction of shellview window. --- dlls/shell32/shlview.c | 29 +++++--- dlls/shell32/tests/shlview.c | 156 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 171 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b26a2ce..d6c427e 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1923,22 +1923,29 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow(IShellView3 *iface, IShellVi static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView3 *iface) { - IShellViewImpl *This = impl_from_IShellView3(iface); + IShellViewImpl *This = impl_from_IShellView3(iface); - TRACE("(%p)\n",This); + TRACE("(%p)\n", This); - /*Make absolutely sure all our UI is cleaned up.*/ - IShellView3_UIActivate(iface, SVUIA_DEACTIVATE); + if (!This->hWnd) + return S_OK; - if(This->hMenu) - DestroyMenu(This->hMenu); + /* Make absolutely sure all our UI is cleaned up. */ + IShellView3_UIActivate(iface, SVUIA_DEACTIVATE); - DestroyWindow(This->hWnd); - if(This->pShellBrowser) IShellBrowser_Release(This->pShellBrowser); - if(This->pCommDlgBrowser) ICommDlgBrowser_Release(This->pCommDlgBrowser); + if (This->hMenu) + DestroyMenu(This->hMenu); + DestroyWindow(This->hWnd); + if (This->pShellBrowser) IShellBrowser_Release(This->pShellBrowser); + if (This->pCommDlgBrowser) ICommDlgBrowser_Release(This->pCommDlgBrowser); - return S_OK; + This->hMenu = NULL; + This->hWnd = NULL; + This->pShellBrowser = NULL; + This->pCommDlgBrowser = NULL; + + return S_OK; } static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView3 *iface, LPFOLDERSETTINGS lpfs) @@ -2068,7 +2075,7 @@ static HRESULT WINAPI IShellView3_fnCreateViewWindow3(IShellView3 *iface, IShell *hwnd = NULL; - if (!owner) + if (!owner || This->hWnd) return E_UNEXPECTED; if (view_flags != SV3CVW3_DEFAULT) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index b5ed40b..2d323d9 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -485,13 +485,153 @@ static const struct message folderview_getfocused_seq[] = { { 0 } }; -static void test_IShellView_CreateViewWindow(void) +static HRESULT WINAPI shellbrowser_QueryInterface(IShellBrowser *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(&IID_IShellBrowser, riid) || + IsEqualGUID(&IID_IOleWindow, riid) || + IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI shellbrowser_AddRef(IShellBrowser *iface) +{ + return 2; +} + +static ULONG WINAPI shellbrowser_Release(IShellBrowser *iface) +{ + return 1; +} + +static HRESULT WINAPI shellbrowser_GetWindow(IShellBrowser *iface, HWND *phwnd) +{ + *phwnd = GetDesktopWindow(); + return S_OK; +} + +static HRESULT WINAPI shellbrowser_ContextSensitiveHelp(IShellBrowser *iface, BOOL mode) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_InsertMenusSB(IShellBrowser *iface, HMENU hmenuShared, + OLEMENUGROUPWIDTHS *menuwidths) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetMenuSB(IShellBrowser *iface, HMENU hmenuShared, + HOLEMENU holemenuReserved, HWND hwndActiveObject) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_RemoveMenusSB(IShellBrowser *iface, HMENU hmenuShared) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetStatusTextSB(IShellBrowser *iface, LPCOLESTR text) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_EnableModelessSB(IShellBrowser *iface, BOOL enable) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_TranslateAcceleratorSB(IShellBrowser *iface, MSG *pmsg, WORD wID) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_BrowseObject(IShellBrowser *iface, LPCITEMIDLIST pidl, UINT flags) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetViewStateStream(IShellBrowser *iface, DWORD mode, IStream **stream) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, + WPARAM wParam, LPARAM lParam, LRESULT *pret) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_QueryActiveShellView(IShellBrowser *iface, IShellView **view) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_OnViewWindowActive(IShellBrowser *iface, IShellView *view) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetToolbarItems(IShellBrowser *iface, LPTBBUTTONSB buttons, + UINT count, UINT flags) +{ + return E_NOTIMPL; +} + +static const IShellBrowserVtbl shellbrowservtbl = { + shellbrowser_QueryInterface, + shellbrowser_AddRef, + shellbrowser_Release, + shellbrowser_GetWindow, + shellbrowser_ContextSensitiveHelp, + shellbrowser_InsertMenusSB, + shellbrowser_SetMenuSB, + shellbrowser_RemoveMenusSB, + shellbrowser_SetStatusTextSB, + shellbrowser_EnableModelessSB, + shellbrowser_TranslateAcceleratorSB, + shellbrowser_BrowseObject, + shellbrowser_GetViewStateStream, + shellbrowser_GetControlWindow, + shellbrowser_SendControlMsg, + shellbrowser_QueryActiveShellView, + shellbrowser_OnViewWindowActive, + shellbrowser_SetToolbarItems +}; + +static IShellBrowser test_shellbrowser = { &shellbrowservtbl }; + +static void test_CreateViewWindow(void) { IShellFolder *desktop; + HWND hwnd_view, hwnd2; FOLDERSETTINGS settings; IShellView *view; IDropTarget *dt; - HWND hwnd_view; HRESULT hr; RECT r = {0}; @@ -519,6 +659,16 @@ if (0) ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); ok(hwnd_view == 0, "got %p\n", hwnd_view); + hwnd_view = NULL; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(hwnd_view != 0, "got %p\n", hwnd_view); + + hwnd2 = (HWND)0xdeadbeef; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd2); + ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); + ok(hwnd2 == NULL, "got %p\n", hwnd_view); + /* ::DragLeave without drag operation */ hr = IShellView_QueryInterface(view, &IID_IDropTarget, (void**)&dt); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -1158,7 +1308,7 @@ START_TEST(shlview) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - test_IShellView_CreateViewWindow(); + test_CreateViewWindow(); test_IFolderView(); test_GetItemObject(); test_IShellFolderView();

1 0

Sebastian Lackner : ntdll: Use lockfree implementation for get_cached_fd.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 40c912b4bef45099d465ddb9a7cb16f33ec4ed3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c912b4bef45099d465ddb9a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 30 04:22:53 2015 +0200 ntdll: Use lockfree implementation for get_cached_fd. --- dlls/ntdll/server.c | 105 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 69d01be..652a1aa 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -75,6 +75,8 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#include "windef.h" +#include "winnt.h" #include "wine/library.h" #include "wine/server.h" #include "wine/debug.h" @@ -126,6 +128,17 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION fd_cache_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +/* atomically exchange a 64-bit value */ +static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val ) +{ +#ifdef _WIN64 + return (LONG64)interlocked_xchg_ptr( (void **)dest, (void *)val ); +#else + LONG64 tmp = *dest; + while (interlocked_cmpxchg64( dest, val, tmp ) != tmp) tmp = *dest; + return tmp; +#endif +} #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); @@ -790,19 +803,27 @@ static int receive_fd( obj_handle_t *handle ) /***********************************************************************/ /* fd cache support */ -struct fd_cache_entry +#include "pshpack1.h" +union fd_cache_entry { - int fd; - enum server_fd_type type : 5; - unsigned int access : 3; - unsigned int options : 24; + LONG64 data; + struct + { + int fd; + enum server_fd_type type : 5; + unsigned int access : 3; + unsigned int options : 24; + } s; }; +#include "poppack.h" -#define FD_CACHE_BLOCK_SIZE (65536 / sizeof(struct fd_cache_entry)) +C_ASSERT( sizeof(union fd_cache_entry) == sizeof(LONG64) ); + +#define FD_CACHE_BLOCK_SIZE (65536 / sizeof(union fd_cache_entry)) #define FD_CACHE_ENTRIES 128 -static struct fd_cache_entry *fd_cache[FD_CACHE_ENTRIES]; -static struct fd_cache_entry fd_cache_initial_block[FD_CACHE_BLOCK_SIZE]; +static union fd_cache_entry *fd_cache[FD_CACHE_ENTRIES]; +static union fd_cache_entry fd_cache_initial_block[FD_CACHE_BLOCK_SIZE]; static inline unsigned int handle_to_index( HANDLE handle, unsigned int *entry ) { @@ -821,6 +842,7 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, unsigned int access, unsigned int options ) { unsigned int entry, idx = handle_to_index( handle, &entry ); + union fd_cache_entry cache; if (entry >= FD_CACHE_ENTRIES) { @@ -833,26 +855,26 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, if (!entry) fd_cache[0] = fd_cache_initial_block; else { - void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(struct fd_cache_entry), + void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), PROT_READ | PROT_WRITE, 0 ); if (ptr == MAP_FAILED) return FALSE; fd_cache[entry] = ptr; } } + /* store fd+1 so that 0 can be used as the unset value */ - fd = interlocked_xchg( &fd_cache[entry][idx].fd, fd + 1 ); - fd_cache[entry][idx].type = type; - fd_cache[entry][idx].access = access; - fd_cache[entry][idx].options = options; - assert( !fd ); + cache.s.fd = fd + 1; + cache.s.type = type; + cache.s.access = access; + cache.s.options = options; + cache.data = interlocked_xchg64( &fd_cache[entry][idx].data, cache.data ); + assert( !cache.s.fd ); return TRUE; } /*********************************************************************** * get_cached_fd - * - * Caller must hold fd_cache_section. */ static inline int get_cached_fd( HANDLE handle, enum server_fd_type *type, unsigned int *access, unsigned int *options ) @@ -862,10 +884,12 @@ static inline int get_cached_fd( HANDLE handle, enum server_fd_type *type, if (entry < FD_CACHE_ENTRIES && fd_cache[entry]) { - fd = fd_cache[entry][idx].fd - 1; - if (type) *type = fd_cache[entry][idx].type; - if (access) *access = fd_cache[entry][idx].access; - if (options) *options = fd_cache[entry][idx].options; + union fd_cache_entry cache; + cache.data = interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, 0 ); + fd = cache.s.fd - 1; + if (type) *type = cache.s.type; + if (access) *access = cache.s.access; + if (options) *options = cache.s.options; } return fd; } @@ -880,7 +904,11 @@ int server_remove_fd_from_cache( HANDLE handle ) int fd = -1; if (entry < FD_CACHE_ENTRIES && fd_cache[entry]) - fd = interlocked_xchg( &fd_cache[entry][idx].fd, 0 ) - 1; + { + union fd_cache_entry cache; + cache.data = interlocked_xchg64( &fd_cache[entry][idx].data, 0 ); + fd = cache.s.fd - 1; + } return fd; } @@ -903,33 +931,36 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, *needs_close = 0; wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA; - server_enter_uninterrupted_section( &fd_cache_section, &sigset ); - fd = get_cached_fd( handle, type, &access, options ); if (fd != -1) goto done; - SERVER_START_REQ( get_handle_fd ) + server_enter_uninterrupted_section( &fd_cache_section, &sigset ); + fd = get_cached_fd( handle, type, &access, options ); + if (fd == -1) { - req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) + SERVER_START_REQ( get_handle_fd ) { - if (type) *type = reply->type; - if (options) *options = reply->options; - access = reply->access; - if ((fd = receive_fd( &fd_handle )) != -1) + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) { - assert( wine_server_ptr_handle(fd_handle) == handle ); - *needs_close = (!reply->cacheable || - !add_fd_to_cache( handle, fd, reply->type, - reply->access, reply->options )); + if (type) *type = reply->type; + if (options) *options = reply->options; + access = reply->access; + if ((fd = receive_fd( &fd_handle )) != -1) + { + assert( wine_server_ptr_handle(fd_handle) == handle ); + *needs_close = (!reply->cacheable || + !add_fd_to_cache( handle, fd, reply->type, + reply->access, reply->options )); + } + else ret = STATUS_TOO_MANY_OPENED_FILES; } - else ret = STATUS_TOO_MANY_OPENED_FILES; } + SERVER_END_REQ; } - SERVER_END_REQ; + server_leave_uninterrupted_section( &fd_cache_section, &sigset ); done: - server_leave_uninterrupted_section( &fd_cache_section, &sigset ); if (!ret && ((access & wanted_access) != wanted_access)) { ret = STATUS_ACCESS_DENIED;

1 0

Vincent Povirk : winex11.drv: Report failure when we can' t convert a selection.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 14eff7b92aef9442229a727212001fcb68a00f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eff7b92aef9442229a72721… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 1 15:05:11 2015 -0500 winex11.drv: Report failure when we can't convert a selection. --- dlls/winex11.drv/clipboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index dad4a7a..96b7878 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3506,6 +3506,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev else { LPWINE_CLIPFORMAT lpFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, event->target); + BOOL success = FALSE; if (lpFormat && lpFormat->lpDrvExportFunc) { @@ -3536,9 +3537,13 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev GlobalUnlock(hClipData); GlobalFree(hClipData); + success = TRUE; } } } + + if (!success) + rprop = None; /* report failure to client */ } END:

1 0

Alexandre Julliard : winex11: Remove unnecessary CLIPBOARDINFO structure.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 6fec7d658b8b448926bd2fa5086b0eda7022cf4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fec7d658b8b448926bd2fa50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 4 18:30:39 2015 +0900 winex11: Remove unnecessary CLIPBOARDINFO structure. --- dlls/winex11.drv/clipboard.c | 111 +++++++++++++------------------------------ 1 file changed, 33 insertions(+), 78 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 96b7878..a460e0a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -99,15 +99,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define S_PRIMARY 1 #define S_CLIPBOARD 2 -typedef struct -{ - HWND hWndOpen; - HWND hWndOwner; - HWND hWndViewer; - UINT seqno; - UINT flags; -} CLIPBOARDINFO, *LPCLIPBOARDINFO; - struct tagWINE_CLIPDATA; /* Forward */ typedef HANDLE (*DRVEXPORTFUNC)(Display *display, Window requestor, Atom aTarget, Atom rprop, @@ -168,8 +159,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, A static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat(UINT id, Atom prop); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wFormatID); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); -static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void); -static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display, LPCLIPBOARDINFO lpcbinfo); +static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display); static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData); static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, unsigned char** data, unsigned long* datasize); @@ -483,34 +473,24 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr /************************************************************************** - * X11DRV_CLIPBOARD_GetClipboardInfo + * X11DRV_CLIPBOARD_IsProcessOwner */ -static BOOL X11DRV_CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) +static BOOL X11DRV_CLIPBOARD_IsProcessOwner( HWND *owner ) { - BOOL bRet = FALSE; + BOOL ret = FALSE; SERVER_START_REQ( set_clipboard_info ) { req->flags = 0; - - if (wine_server_call_err( req )) + if (!wine_server_call_err( req )) { - ERR("Failed to get clipboard owner.\n"); - } - else - { - cbInfo->hWndOpen = wine_server_ptr_handle( reply->old_clipboard ); - cbInfo->hWndOwner = wine_server_ptr_handle( reply->old_owner ); - cbInfo->hWndViewer = wine_server_ptr_handle( reply->old_viewer ); - cbInfo->seqno = reply->seqno; - cbInfo->flags = reply->flags; - - bRet = TRUE; + *owner = wine_server_ptr_handle( reply->old_owner ); + ret = (reply->flags & CB_PROCESS); } } SERVER_END_REQ; - return bRet; + return ret; } @@ -519,24 +499,16 @@ static BOOL X11DRV_CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) */ static BOOL X11DRV_CLIPBOARD_ReleaseOwnership(void) { - BOOL bRet = FALSE; + BOOL ret; SERVER_START_REQ( set_clipboard_info ) { req->flags = SET_CB_RELOWNER | SET_CB_SEQNO; - - if (wine_server_call_err( req )) - { - ERR("Failed to set clipboard.\n"); - } - else - { - bRet = TRUE; - } + ret = !wine_server_call_err( req ); } SERVER_END_REQ; - return bRet; + return ret; } @@ -634,22 +606,24 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) /************************************************************************** * X11DRV_CLIPBOARD_UpdateCache */ -static BOOL X11DRV_CLIPBOARD_UpdateCache(LPCLIPBOARDINFO lpcbinfo) +static BOOL X11DRV_CLIPBOARD_UpdateCache(void) { BOOL bret = TRUE; - if (!X11DRV_CLIPBOARD_IsSelectionOwner()) + if (!selectionAcquired) { - if (!X11DRV_CLIPBOARD_GetClipboardInfo(lpcbinfo)) + DWORD seqno = GetClipboardSequenceNumber(); + + if (!seqno) { ERR("Failed to retrieve clipboard information.\n"); bret = FALSE; } - else if (wSeqNo < lpcbinfo->seqno) + else if (wSeqNo < seqno) { X11DRV_EmptyClipboard(TRUE); - if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display(), lpcbinfo) < 0) + if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) { ERR("Failed to cache clipboard data owned by another process.\n"); bret = FALSE; @@ -659,7 +633,7 @@ static BOOL X11DRV_CLIPBOARD_UpdateCache(LPCLIPBOARDINFO lpcbinfo) X11DRV_EndClipboardUpdate(); } - wSeqNo = lpcbinfo->seqno; + wSeqNo = seqno; } } @@ -680,7 +654,7 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa if (lpData->wFlags & CF_FLAG_SYNTHESIZED) bret = X11DRV_CLIPBOARD_RenderSynthesizedFormat(display, lpData); - else if (!X11DRV_CLIPBOARD_IsSelectionOwner()) + else if (!selectionAcquired) { if (!X11DRV_CLIPBOARD_ReadSelectionData(display, lpData)) { @@ -691,15 +665,15 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa } else { - CLIPBOARDINFO cbInfo; + HWND owner = GetClipboardOwner(); - if (X11DRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner) + if (owner) { /* Send a WM_RENDERFORMAT message to notify the owner to render the * data requested into the clipboard. */ - TRACE("Sending WM_RENDERFORMAT message to hwnd(%p)\n", cbInfo.hWndOwner); - SendMessageW(cbInfo.hWndOwner, WM_RENDERFORMAT, lpData->wFormatID, 0); + TRACE("Sending WM_RENDERFORMAT message to hwnd(%p)\n", owner); + SendMessageW(owner, WM_RENDERFORMAT, lpData->wFormatID, 0); if (!lpData->hData) bret = FALSE; } @@ -2400,7 +2374,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p * This queries the selection owner for the TARGETS property and saves all * reported property types. */ -static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display, LPCLIPBOARDINFO lpcbinfo) +static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) { XEvent xe; Atom atype=AnyPropertyType; @@ -2841,21 +2815,19 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi if (selectionAcquired && (w == selectionWindow)) { - CLIPBOARDINFO cbinfo; + HWND owner; /* completely give up the selection */ TRACE("Lost CLIPBOARD (+PRIMARY) selection\n"); - X11DRV_CLIPBOARD_GetClipboardInfo(&cbinfo); - - if (cbinfo.flags & CB_PROCESS) + if (X11DRV_CLIPBOARD_IsProcessOwner( &owner )) { /* Since we're still the owner, this wasn't initiated by another Wine process */ if (OpenClipboard(hwnd)) { /* Destroy private objects */ - SendMessageW(cbinfo.hWndOwner, WM_DESTROYCLIPBOARD, 0, 0); + SendMessageW(owner, WM_DESTROYCLIPBOARD, 0, 0); /* Give up ownership of the windows clipboard */ X11DRV_CLIPBOARD_ReleaseOwnership(); @@ -2899,17 +2871,6 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi /************************************************************************** - * IsSelectionOwner (X11DRV.@) - * - * Returns: TRUE if the selection is owned by this process, FALSE otherwise - */ -static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void) -{ - return selectionAcquired; -} - - -/************************************************************************** * X11DRV Clipboard Exports **************************************************************************/ @@ -3056,10 +3017,9 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) and its rendering is not delayed */ if (!owner) { - CLIPBOARDINFO cbinfo; LPWINE_CLIPDATA lpRender; - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if (!hData || ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && @@ -3080,9 +3040,7 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) */ INT CDECL X11DRV_CountClipboardFormats(void) { - CLIPBOARDINFO cbinfo; - - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); TRACE(" count=%d\n", ClipDataCount); @@ -3095,12 +3053,11 @@ INT CDECL X11DRV_CountClipboardFormats(void) */ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) { - CLIPBOARDINFO cbinfo; struct list *ptr = NULL; TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if (!wFormat) { @@ -3123,11 +3080,10 @@ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) BOOL CDECL X11DRV_IsClipboardFormatAvailable(UINT wFormat) { BOOL bRet = FALSE; - CLIPBOARDINFO cbinfo; TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if (wFormat != 0 && X11DRV_CLIPBOARD_LookupData(wFormat)) bRet = TRUE; @@ -3143,12 +3099,11 @@ BOOL CDECL X11DRV_IsClipboardFormatAvailable(UINT wFormat) */ HANDLE CDECL X11DRV_GetClipboardData(UINT wFormat) { - CLIPBOARDINFO cbinfo; LPWINE_CLIPDATA lpRender; TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat))) {

1 0