ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Implement some folder and file selection functions for the Item Dialog.

This commit is contained in:
David Hedberg 2011-03-29 21:13:22 +02:00 committed by Alexandre Julliard
parent fc771c9f38
commit b5a1c89f6a
2 changed files with 129 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
dlls/comdlg32/itemdlg.c
View File

@ -56,6 +56,12 @@ typedef struct FileDialogImpl {
COMDLG_FILTERSPEC *filterspecs;
UINT filterspec_count;
UINT filetypeindex;
IShellItemArray *psia_selection;
IShellItemArray *psia_results;
IShellItem *psi_defaultfolder;
IShellItem *psi_setfolder;
IShellItem *psi_folder;
} FileDialogImpl;
/**************************************************************************
@ -125,6 +131,12 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface)
}
HeapFree(GetProcessHeap(), 0, This->filterspecs);
if(This->psi_defaultfolder) IShellItem_Release(This->psi_defaultfolder);
if(This->psi_setfolder) IShellItem_Release(This->psi_setfolder);
if(This->psi_folder) IShellItem_Release(This->psi_folder);
if(This->psia_selection) IShellItemArray_Release(This->psia_selection);
if(This->psia_results) IShellItemArray_Release(This->psia_results);
HeapFree(GetProcessHeap(), 0, This);
}
@ -234,29 +246,77 @@ static HRESULT WINAPI IFileDialog2_fnGetOptions(IFileDialog2 *iface, FILEOPENDIA
static HRESULT WINAPI IFileDialog2_fnSetDefaultFolder(IFileDialog2 *iface, IShellItem *psi)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
FIXME("stub - %p (%p)\n", This, psi);
return E_NOTIMPL;
TRACE("%p (%p)\n", This, psi);
if(This->psi_defaultfolder)
IShellItem_Release(This->psi_defaultfolder);
This->psi_defaultfolder = psi;
if(This->psi_defaultfolder)
IShellItem_AddRef(This->psi_defaultfolder);
return S_OK;
}
static HRESULT WINAPI IFileDialog2_fnSetFolder(IFileDialog2 *iface, IShellItem *psi)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
FIXME("stub - %p (%p)\n", This, psi);
return E_NOTIMPL;
TRACE("%p (%p)\n", This, psi);
if(This->psi_setfolder)
IShellItem_Release(This->psi_setfolder);
This->psi_setfolder = psi;
if(This->psi_setfolder)
IShellItem_AddRef(This->psi_setfolder);
return S_OK;
}
static HRESULT WINAPI IFileDialog2_fnGetFolder(IFileDialog2 *iface, IShellItem **ppsi)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
FIXME("stub - %p (%p)\n", This, ppsi);
return E_NOTIMPL;
TRACE("%p (%p)\n", This, ppsi);
if(!ppsi)
return E_INVALIDARG;
/* FIXME:
If the dialog is shown, return the current(ly selected) folder. */
*ppsi = NULL;
if(This->psi_folder)
*ppsi = This->psi_folder;
else if(This->psi_setfolder)
*ppsi = This->psi_setfolder;
else if(This->psi_defaultfolder)
*ppsi = This->psi_defaultfolder;
if(*ppsi)
{
IShellItem_AddRef(*ppsi);
return S_OK;
}
return E_FAIL;
}
static HRESULT WINAPI IFileDialog2_fnGetCurrentSelection(IFileDialog2 *iface, IShellItem **ppsi)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
FIXME("stub - %p (%p)\n", This, ppsi);
return E_NOTIMPL;
HRESULT hr;
TRACE("%p (%p)\n", This, ppsi);
if(!ppsi)
return E_INVALIDARG;
if(This->psia_selection)
{
/* FIXME: Check filename edit box */
hr = IShellItemArray_GetItemAt(This->psia_selection, 0, ppsi);
return hr;
}
return E_FAIL;
}
static HRESULT WINAPI IFileDialog2_fnSetFileName(IFileDialog2 *iface, LPCWSTR pszName)
@ -297,8 +357,29 @@ static HRESULT WINAPI IFileDialog2_fnSetFileNameLabel(IFileDialog2 *iface, LPCWS
static HRESULT WINAPI IFileDialog2_fnGetResult(IFileDialog2 *iface, IShellItem **ppsi)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
FIXME("stub - %p (%p)\n", This, ppsi);
return E_NOTIMPL;
HRESULT hr;
TRACE("%p (%p)\n", This, ppsi);
if(!ppsi)
return E_INVALIDARG;
if(This->psia_results)
{
UINT item_count;
hr = IShellItemArray_GetCount(This->psia_results, &item_count);
if(SUCCEEDED(hr))
{
if(item_count != 1)
return E_FAIL;
/* Adds a reference. */
hr = IShellItemArray_GetItemAt(This->psia_results, 0, ppsi);
}
return hr;
}
return E_UNEXPECTED;
}
static HRESULT WINAPI IFileDialog2_fnAddPlace(IFileDialog2 *iface, IShellItem *psi, FDAP fdap)
@ -566,15 +647,32 @@ static HRESULT WINAPI IFileOpenDialog_fnSetFilter(IFileOpenDialog *iface, IShell
static HRESULT WINAPI IFileOpenDialog_fnGetResults(IFileOpenDialog *iface, IShellItemArray **ppenum)
{
FileDialogImpl *This = impl_from_IFileOpenDialog(iface);
FIXME("stub - %p (%p)\n", This, ppenum);
return E_NOTIMPL;
TRACE("%p (%p)\n", This, ppenum);
*ppenum = This->psia_results;
if(*ppenum)
{
IShellItemArray_AddRef(*ppenum);
return S_OK;
}
return E_FAIL;
}
static HRESULT WINAPI IFileOpenDialog_fnGetSelectedItems(IFileOpenDialog *iface, IShellItemArray **ppsai)
{
FileDialogImpl *This = impl_from_IFileOpenDialog(iface);
FIXME("stub - %p (%p)\n", This, ppsai);
return E_NOTIMPL;
TRACE("%p (%p)\n", This, ppsai);
if(This->psia_selection)
{
*ppsai = This->psia_selection;
IShellItemArray_AddRef(*ppsai);
return S_OK;
}
return E_FAIL;
}
static const IFileOpenDialogVtbl vt_IFileOpenDialog = {
@ -864,6 +962,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p
{
FileDialogImpl *fdimpl;
HRESULT hr;
IShellFolder *psf;
TRACE("%p, %s, %p\n", pUnkOuter, debugstr_guid(riid), ppv);
if(!ppv)
@ -895,6 +994,15 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p
fdimpl->filterspec_count = 0;
fdimpl->filetypeindex = 0;
fdimpl->psia_selection = fdimpl->psia_results = NULL;
fdimpl->psi_setfolder = fdimpl->psi_folder = NULL;
/* FIXME: The default folder setting should be restored for the
* application if it was previously set. */
SHGetDesktopFolder(&psf);
SHGetItemFromObject((IUnknown*)psf, &IID_IShellItem, (void**)&fdimpl->psi_defaultfolder);
IShellFolder_Release(psf);
hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv);
IUnknown_Release((IUnknown*)fdimpl);
return hr;

23
dlls/comdlg32/tests/itemdlg.c
View File

@ -223,21 +223,18 @@ static void test_basics(void)
"Unexpected default options: 0x%08x\n", fdoptions);
/* GetResult */
todo_wine
{
hr = IFileOpenDialog_GetResult(pfod, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr);
hr = IFileSaveDialog_GetResult(pfsd, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr);
}
psi = (void*)0xdeadbeef;
hr = IFileOpenDialog_GetResult(pfod, &psi);
todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
ok(psi == (void*)0xdeadbeef, "got %p.\n", psi);
psi = (void*)0xdeadbeef;
hr = IFileSaveDialog_GetResult(pfsd, &psi);
todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
ok(psi == (void*)0xdeadbeef, "got %p.\n", psi);
/* GetCurrentSelection */
@ -336,13 +333,10 @@ static void test_basics(void)
}
/* SetFolder */
todo_wine
{
hr = IFileOpenDialog_SetFolder(pfod, NULL);
ok(hr == S_OK, "got 0x%08x.\n", hr);
hr = IFileSaveDialog_SetFolder(pfsd, NULL);
ok(hr == S_OK, "got 0x%08x.\n", hr);
}
/* SetDefaultExtension */
todo_wine
@ -363,8 +357,6 @@ static void test_basics(void)
}
/* SetDefaultFolder */
todo_wine
{
hr = IFileOpenDialog_SetDefaultFolder(pfod, NULL);
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IFileSaveDialog_SetDefaultFolder(pfsd, NULL);
@ -374,7 +366,6 @@ static void test_basics(void)
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IFileSaveDialog_SetDefaultFolder(pfsd, psidesktop);
ok(hr == S_OK, "got 0x%08x\n", hr);
}
if(0)
{
@ -385,10 +376,10 @@ static void test_basics(void)
/* GetFolder / SetFolder */
hr = IFileOpenDialog_GetFolder(pfod, NULL);
todo_wine ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr);
ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr);
hr = IFileOpenDialog_GetFolder(pfod, &psi_original);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr);
ok(hr == S_OK, "got 0x%08x.\n", hr);
if(SUCCEEDED(hr))
{
hr = IFileOpenDialog_SetFolder(pfod, psidesktop);
@ -399,7 +390,7 @@ static void test_basics(void)
}
hr = IFileSaveDialog_GetFolder(pfsd, &psi_original);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr);
ok(hr == S_OK, "got 0x%08x.\n", hr);
if(SUCCEEDED(hr))
{
hr = IFileSaveDialog_SetFolder(pfsd, psidesktop);
@ -523,8 +514,8 @@ static void test_basics(void)
}
psia = (void*)0xdeadbeef;
hr = IFileOpenDialog_GetResults(pfod, &psia);
todo_wine ok(hr == E_FAIL, "got 0x%08x.\n", hr);
todo_wine ok(psia == NULL, "got %p.\n", psia);
ok(hr == E_FAIL, "got 0x%08x.\n", hr);
ok(psia == NULL, "got %p.\n", psia);
/* GetSelectedItems */
if(0)