interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Began moving the file dialogs to the new Common Item Dialog. Doesn't quite work yet.

This commit is contained in:
Pietro Gagliardi 2015-05-31 20:27:01 -04:00
parent ef1b594ef0
commit f403c23001
2 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
redo/windows/stddialogs.c
View File

@ -6,36 +6,51 @@
// this should be reasonable // this should be reasonable
#define NFILENAME 4096 #define NFILENAME 4096
// TODO not in MinGW-w64?
#define FOS_SUPPORTSTREAMABLEITEMS 0x80000000
char *uiOpenFile(void) char *uiOpenFile(void)
{ {
WCHAR wfilename[NFILENAME]; IFileOpenDialog *d;
OPENFILENAMEW ofn; FILEOPENDIALOGOPTIONS opts;
HWND dialogHelper; HWND dialogHelper;
DWORD err; IShellItem *result;
WCHAR *wname;
char *name;
HRESULT hr;
hr = CoCreateInstance(&CLSID_FileOpenDialog,
NULL, CLSCTX_INPROC_SERVER,
&IID_IFileOpenDialog, (LPVOID *) (&d));
if (hr != S_OK)
logHRESULT("error creating common item dialog in uiOpenFile()", hr);
hr = IFileOpenDialog_GetOptions(d, &opts);
if (hr != S_OK)
logHRESULT("error getting current options in uiOpenFile()", hr);
opts |= FOS_NOCHANGEDIR | FOS_ALLNONSTORAGEITEMS | FOS_NOVALIDATE | FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_SHAREAWARE | FOS_NOTESTFILECREATE | FOS_NODEREFERENCELINKS | FOS_FORCESHOWHIDDEN | FOS_DEFAULTNOMINIMODE | FOS_SUPPORTSTREAMABLEITEMS;
hr = IFileOpenDialog_SetOptions(d, opts);
if (hr != S_OK)
logHRESULT("error setting options in uiOpenFile()", hr);
dialogHelper = beginDialogHelper(); dialogHelper = beginDialogHelper();
wfilename[0] = L'\0'; // required by GetOpenFileName() to indicate no previous filename hr = IFileOpenDialog_Show(d, dialogHelper);
ZeroMemory(&ofn, sizeof (OPENFILENAMEW)); endDialogHelper(dialogHelper);
ofn.lStructSize = sizeof (OPENFILENAMEW); if (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED)) {
ofn.hwndOwner = dialogHelper; IFileOpenDialog_Release(d);
ofn.hInstance = hInstance;
ofn.lpstrFilter = NULL; // no filters
ofn.lpstrFile = wfilename;
ofn.nMaxFile = NFILENAME; // seems to include null terminator according to docs
ofn.lpstrInitialDir = NULL; // let system decide
ofn.lpstrTitle = NULL; // let system decide
ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_FORCESHOWHIDDEN | OFN_HIDEREADONLY | OFN_LONGNAMES | OFN_NOCHANGEDIR | OFN_NODEREFERENCELINKS | OFN_NOTESTFILECREATE | OFN_PATHMUSTEXIST | OFN_SHAREAWARE;
if (GetOpenFileNameW(&ofn) == FALSE) {
err = CommDlgExtendedError();
if (err != 0)
// TODO
complain("error running open file dialog", err);
// otherwise user cancelled
endDialogHelper(dialogHelper);
return NULL; return NULL;
} }
endDialogHelper(dialogHelper); if (hr != S_OK)
return toUTF8(wfilename); logHRESULT("error showing dialog in uiOpenFile()", hr);
hr = IFileOpenDialog_GetResult(d, &result);
if (hr != S_OK)
logHRESULT("error getting dialog result in uiOpenFile()", hr);
hr = IShellItem_GetDisplayName(result, SIGDN_FILESYSPATH, &wname);
if (hr != S_OK)
logHRESULT("error getting filename in uiOpenFile()", hr);
name = toUTF8(wname);
CoTaskMemFree(wname);
IShellItem_Release(result);
IFileOpenDialog_Release(d);
return name;
} }
char *uiSaveFile(void) char *uiSaveFile(void)
@ -71,7 +86,7 @@ char *uiSaveFile(void)
return toUTF8(wfilename); return toUTF8(wfilename);
} }
// TODO MinGW-w64 doesn't support task dialogs // TODO MinGW-w64 3.x doesn't support task dialogs
#define TDCBF_OK_BUTTON 0x0001 #define TDCBF_OK_BUTTON 0x0001
#define TD_ERROR_ICON MAKEINTRESOURCEW(-2) #define TD_ERROR_ICON MAKEINTRESOURCEW(-2)
typedef int TASKDIALOG_COMMON_BUTTON_FLAGS; // Note: _TASKDIALOG_COMMON_BUTTON_FLAGS is an int typedef int TASKDIALOG_COMMON_BUTTON_FLAGS; // Note: _TASKDIALOG_COMMON_BUTTON_FLAGS is an int

1
redo/windows/winapi.h
View File

@ -25,3 +25,4 @@
#include <stdarg.h> #include <stdarg.h>
#include <oleacc.h> #include <oleacc.h>
#include <stdio.h> #include <stdio.h>
#include <shobjidl.h>