Module: wine Branch: master Commit: 5fd6180a19bf3aa3eef132d9f9b05a01f85cae44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd6180a19bf3aa3eef132d9f9...
Author: David Hedberg david.hedberg@gmail.com Date: Tue May 24 21:09:49 2011 +0200
comdlg32: Add IOleWindow implementation to the Item Dialog.
---
dlls/comdlg32/itemdlg.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 52 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-)
diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index dc447c2..a04b86a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -65,6 +65,7 @@ typedef struct FileDialogImpl { IExplorerBrowserEvents IExplorerBrowserEvents_iface; IServiceProvider IServiceProvider_iface; ICommDlgBrowser3 ICommDlgBrowser3_iface; + IOleWindow IOleWindow_iface; LONG ref;
FILEOPENDIALOGOPTIONS options; @@ -910,6 +911,10 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->ICommDlgBrowser3_iface; } + else if(IsEqualGUID(&IID_IOleWindow, riid)) + { + *ppvObject = &This->IOleWindow_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid));
@@ -2206,6 +2211,55 @@ static const ICommDlgBrowser3Vtbl vt_ICommDlgBrowser3 = { ICommDlgBrowser3_fnOnPreviewCreated };
+/************************************************************************** + * IOleWindow implementation + */ +static inline FileDialogImpl *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, IOleWindow_iface); +} + +static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMOde) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + FIXME("Stub: %p (%d)\n", This, fEnterMOde); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + TRACE("%p (%p)\n", This, phwnd); + *phwnd = This->dlg_hwnd; + return S_OK; +} + +static const IOleWindowVtbl vt_IOleWindow = { + IOleWindow_fnQueryInterface, + IOleWindow_fnAddRef, + IOleWindow_fnRelease, + IOleWindow_fnGetWindow, + IOleWindow_fnContextSensitiveHelp +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -2227,6 +2281,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; fdimpl->IServiceProvider_iface.lpVtbl = &vt_IServiceProvider; fdimpl->ICommDlgBrowser3_iface.lpVtbl = &vt_ICommDlgBrowser3; + fdimpl->IOleWindow_iface.lpVtbl = &vt_IOleWindow;
if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index fcd0e50..7c52868 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -166,6 +166,7 @@ static BOOL test_instantiation(void) IFileOpenDialog *pfod; IFileSaveDialog *pfsd; IServiceProvider *psp; + IOleWindow *pow; IUnknown *punk; HRESULT hr; LONG ref; @@ -235,6 +236,31 @@ static BOOL test_instantiation(void) ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk);
+ hr = IFileOpenDialog_QueryInterface(pfod, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) + { + HWND hwnd; + + hr = IOleWindow_ContextSensitiveHelp(pow, TRUE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IOleWindow_ContextSensitiveHelp(pow, FALSE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + if(0) + { + /* Crashes on win7 */ + IOleWindow_GetWindow(pow, NULL); + } + + hr = IOleWindow_GetWindow(pow, &hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(hwnd == NULL, "Got %p\n", hwnd); + + IOleWindow_Release(pow); + } + ref = IFileOpenDialog_Release(pfod); ok(!ref, "Got refcount %d, should have been released.\n", ref);
@@ -280,6 +306,32 @@ static BOOL test_instantiation(void) ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk);
+ hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) + { + HWND hwnd; + + hr = IOleWindow_ContextSensitiveHelp(pow, TRUE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IOleWindow_ContextSensitiveHelp(pow, FALSE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + if(0) + { + /* Crashes on win7 */ + IOleWindow_GetWindow(pow, NULL); + } + + hr = IOleWindow_GetWindow(pow, &hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(hwnd == NULL, "Got %p\n", hwnd); + + IOleWindow_Release(pow); + } + + ref = IFileSaveDialog_Release(pfsd); ok(!ref, "Got refcount %d, should have been released.\n", ref); return TRUE;
-
Alexandre Julliard