wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 661991 - add support for new folder pickers. r=ehsan

Browse Source
This commit is contained in:
Jim Mathies 2011-12-14 15:22:28 -06:00
parent f75842a940
commit 6540425368
2 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
widget/src/windows/nsFilePicker.cpp
View File

@ -163,6 +163,9 @@ private:
nsFilePicker::nsFilePicker() :
mSelectedType(1)
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
, mFDECookie(0)
#endif
{
CoInitialize(NULL);
}
@ -183,7 +186,7 @@ STDMETHODIMP nsFilePicker::QueryInterface(REFIID refiid, void** ppvResult)
{
*ppvResult = NULL;
if (IID_IUnknown == refiid ||
refiid == __uuidof(IFileDialogEvents)) {
refiid == IID_IFileDialogEvents) {
*ppvResult = this;
}
@ -342,7 +345,8 @@ nsFilePicker::OnFileOk(IFileDialog *pfd)
}
HRESULT
nsFilePicker::OnFolderChanging(IFileDialog *pfd, IShellItem *psiFolder)
nsFilePicker::OnFolderChanging(IFileDialog *pfd,
IShellItem *psiFolder)
{
return S_OK;
}
@ -360,7 +364,9 @@ nsFilePicker::OnSelectionChange(IFileDialog *pfd)
}
HRESULT
nsFilePicker::OnShareViolation(IFileDialog *pfd, IShellItem *psi, FDE_SHAREVIOLATION_RESPONSE *pResponse)
nsFilePicker::OnShareViolation(IFileDialog *pfd,
IShellItem *psi,
FDE_SHAREVIOLATION_RESPONSE *pResponse)
{
return S_OK;
}
@ -372,7 +378,9 @@ nsFilePicker::OnTypeChange(IFileDialog *pfd)
}
HRESULT
nsFilePicker::OnOverwrite(IFileDialog *pfd, IShellItem *psi, FDE_OVERWRITE_RESPONSE *pResponse)
nsFilePicker::OnOverwrite(IFileDialog *pfd,
IShellItem *psi,
FDE_OVERWRITE_RESPONSE *pResponse)
{
return S_OK;
}
@ -432,7 +440,52 @@ nsFilePicker::ShowXPFolderPicker(const nsString& aInitialDir)
bool
nsFilePicker::ShowFolderPicker(const nsString& aInitialDir)
{
return false;
nsRefPtr<IFileOpenDialog> dialog;
if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC,
IID_IFileOpenDialog,
getter_AddRefs(dialog))))
return false;
// hook up event callbacks
dialog->Advise(this, &mFDECookie);
// options
FILEOPENDIALOGOPTIONS fos = 0;
fos |= FOS_PICKFOLDERS;
dialog->SetOptions(fos);
// initial strings
dialog->SetTitle(mTitle.get());
if (!aInitialDir.IsEmpty()) {
nsRefPtr<IShellItem> folder;
if (SUCCEEDED(SHCreateItemFromParsingName(aInitialDir.get(), NULL,
IID_IShellItem,
getter_AddRefs(folder)))) {
dialog->SetFolder(folder);
}
}
AutoDestroyTmpWindow adtw((HWND)(mParentWidget.get() ?
mParentWidget->GetNativeData(NS_NATIVE_TMP_WINDOW) : NULL));
// display
nsRefPtr<IShellItem> item;
if (FAILED(dialog->Show(adtw.get())) ||
FAILED(dialog->GetResult(getter_AddRefs(item))) ||
!item) {
dialog->Unadvise(mFDECookie);
return false;
}
dialog->Unadvise(mFDECookie);
// results
LPWSTR str = NULL;
if (FAILED(item->GetDisplayName(SIGDN_FILESYSPATH, &str)))
return false;
mUnicodeFile.Assign(str);
CoTaskMemFree(str);
return true;
}
#endif // MOZ_WINSDK_TARGETVER

6
widget/src/windows/nsFilePicker.h
View File

@ -50,6 +50,9 @@
#define _WIN32_WINNT_bak _WIN32_WINNT
#undef _WIN32_WINNT
#define _WIN32_WINNT _WIN32_WINNT_VISTA
#define _WIN32_IE_bak _WIN32_IE
#undef _WIN32_IE
#define _WIN32_IE _WIN32_IE_IE70
#endif
#endif
@ -143,12 +146,15 @@ protected:
static char mLastUsedDirectory[];
nsString mUnicodeFile;
static PRUnichar *mLastUsedUnicodeDirectory;
DWORD mFDECookie;
};
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
#if defined(_WIN32_WINNT_bak)
#undef _WIN32_WINNT
#define _WIN32_WINNT _WIN32_WINNT_bak
#undef _WIN32_IE
#define _WIN32_IE _WIN32_IE_bak
#endif
#endif