tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge win changes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2016-12-03 10:52:30 +01:00
commit 33e09df833
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/windows/rclstartw.cpp
View File

@ -27,30 +27,53 @@ using namespace std;
// cygstart, which uses ShellExecute() did work... So this is just a // cygstart, which uses ShellExecute() did work... So this is just a
// simpler cygstart // simpler cygstart
static char *thisprog; static char *thisprog;
static char usage [] ="rclstartw <fn>\n" static char usage [] ="rclstartw [-m] <fn>\n"
" Will use ShellExecute to open the arg with the default app\n"; " Will use ShellExecute to open the arg with the default app\n"
" -m 1 start maximized\n";
static void Usage(FILE *fp = stderr) static void Usage(FILE *fp = stderr)
{ {
fprintf(fp, "%s: usage:\n%s", thisprog, usage); fprintf(fp, "%s: usage:\n%s", thisprog, usage);
exit(1); exit(1);
} }
int op_flags;
#define OPT_m 0x1
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
thisprog = argv[0]; thisprog = argv[0];
argc--; argv++; argc--; argv++;
int imode = 0;
while (argc > 0 && **argv == '-') {
(*argv)++;
if (!(**argv))
Usage();
while (**argv)
switch (*(*argv)++) {
case 'm': op_flags |= OPT_m; if (argc < 2) Usage();
if ((sscanf(*(++argv), "%d", &imode)) != 1)
Usage();
argc--; goto b1;
default: Usage(); break;
}
b1: argc--; argv++;
}
if (argc != 1) { if (argc != 1) {
Usage(); Usage();
} }
char *fn = strdup(argv[0]); char *fn = strdup(argv[0]);
// Do we need this ? // Do we need this ?
//https://msdn.microsoft.com/en-us/library/windows/desktop/bb762153%28v=vs.85%29.aspx //https://msdn.microsoft.com/en-us/library/windows/desktop/bb762153%28v=vs.85%29.aspx
//CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); //CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
int wmode = SW_SHOWNORMAL;
switch (imode) {
case 1: wmode = SW_SHOWMAXIMIZED;break;
default: wmode = SW_SHOWNORMAL; break;
}
int ret = (int)ShellExecute(NULL, "open", fn, NULL, NULL, SW_SHOWNORMAL); int ret = (int)ShellExecute(NULL, "open", fn, NULL, NULL, wmode);
if (ret) { if (ret) {
fprintf(stderr, "ShellExecute returned %d\n", ret); fprintf(stderr, "ShellExecute returned %d\n", ret);
} }

2
src/windows/recoll-setup.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Recoll" #define MyAppName "Recoll"
#define MyAppVersion "1.23.0-2477ad-20161115" #define MyAppVersion "1.23.0-2bfd80-20161115"
#define MyAppPublisher "Recoll.org" #define MyAppPublisher "Recoll.org"
#define MyAppURL "http://www.recoll.org" #define MyAppURL "http://www.recoll.org"
#define MyAppExeName "recoll.exe" #define MyAppExeName "recoll.exe"