github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixed problem with FileSelNative Set

Browse source
This commit is contained in:
Mirek Fidler 2022-09-14 17:35:42 +02:00
parent 2784431294
commit d04641ee43
3 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
uppsrc/CtrlLib/Win32.cpp
View file

@ -191,31 +191,22 @@ bool FileSelNative::Execute(bool open, const char *dlgtitle) {
ofn.lpstrInitialDir = W32(activedir);
ofn.lpfnHook = sCenterHook;
int bufsize = ofn.nMaxFile = (multi ? 32000 : _MAX_PATH);
Buffer<char16> buffer(bufsize);
*(ofn.lpstrFile = buffer) = 0;
if(!filename.IsEmpty())
{
String out;
for(int i = 0; i < filename.GetCount(); i++)
{
if(*ofn.lpstrInitialDir == 0 && FindFile().Search(AppendFileName(GetFileDirectory(filename[i]), "*")))
ofn.lpstrInitialDir = W32(GetFileDirectory(filename[i]));
if(!open || FileExists(filename[i]))
{
String fn = GetFileName(filename[i]);
if(!IsNull(fn))
{
if(multi && fn.Find(' ') >= 0)
out << W32(String() << '\"' << fn << '\"');
else
out << W32(fn);
out.Cat(0);
}
}
Buffer<char16> buffer(bufsize, 0);
if(filename.GetCount()) {
if(*ofn.lpstrInitialDir == 0 && FindFile().Search(AppendFileName(GetFileDirectory(filename[0]), "*")))
ofn.lpstrInitialDir = W32(GetFileDirectory(filename[0]));
if(!open || FileExists(filename[0])) {
String out;
String fn = GetFileName(filename[0]);
if(multi && fn.Find(' ') >= 0)
out << String() << '\"' << fn << '\"';
else
out << fn;
Vector<char16> w32 = ToSystemCharsetW(out);
memcpy(buffer, w32, min(bufsize - 1, int(w32.GetCount() * sizeof(wchar))));
}
int l = min(out.GetLength(), bufsize - 1);
memcpy(buffer, out, l + 1);
}
ofn.lpstrFile = buffer;
if(dlgtitle)
ofn.lpstrTitle = W32(dlgtitle);

9
upptst/FileSelNativeMultiPre/FileSelNativeMultiPre.upp Normal file
View file

@ -0,0 +1,9 @@
uses
CtrlLib;
file
main.cpp;
mainconfig
"" = "GUI";

17
upptst/FileSelNativeMultiPre/main.cpp Normal file
View file

@ -0,0 +1,17 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
GUI_APP_MAIN
{
FileSelNative sel;
sel.AllFilesType();
sel.Type("All", "*.*");
sel.Multi();
sel.NoAsking();
sel = GetDataFile("main.cpp");
if(sel.ExecuteSaveAs("save as"))
PromptOK("\1" + ~sel);
}