christofsteel/wix-on-linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create the cab with the files in the right order.

Browse source 
In my test MSI, the files are supposed to be in alphabetical order,
not in 'whatever order lcab enumerated the Unix directory I pointed it
at' order. The test MSI didn't install, but with this change, it does,
so my guess is that either the real Windows installer system depends
on the alphabetical order for a search algorithm, or else files in the
cab are referred to by a numeric index of some kind.
This commit is contained in:
Simon Tatham 2017-05-15 21:00:12 +01:00
parent 505ea0fc84
commit 0985b382d3
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fake-winterop.c
View file

@ -29,6 +29,9 @@ typedef struct CabCreateContext {
char *tempdir;
char *outdir;
char *outfile;
char **args;
int nargs, argsize;
} CabCreateContext;
uint32_t CreateCabBegin(const char16_t *wzCab, const char16_t *wzCabDir,
@ -43,6 +46,11 @@ uint32_t CreateCabBegin(const char16_t *wzCab, const char16_t *wzCabDir,
ctx->tempdir = dupcat(ctx->outdir, "/cabXXXXXX", (const char *)NULL);
if (!mkdtemp(ctx->tempdir))
err(1, "mkdtemp");
ctx->nargs = 0;
ctx->argsize = 16;
ctx->args = snewn(ctx->argsize, char *);
ctx->args[ctx->nargs++] = dupcat("lcab", (const char *)NULL);
ctx->args[ctx->nargs++] = dupcat("-n", (const char *)NULL);
*out_ctx = ctx;
return 0;
}
@ -54,9 +62,15 @@ uint32_t CreateCabAddFile(const char16_t *wzFile, const char16_t *wzToken,
char *file_abs = realpath(file, NULL);
char *cabname = ascii(wzToken, true);
char *cab_abs = dupcat(ctx->tempdir, "/", cabname, (const char *)NULL);
printf("CreateCabAddFile: %s <- %s\n", ctx->outfile, file_abs);
printf("CreateCabAddFile: %s :: %s <- %s\n", ctx->outfile,
cabname, file_abs);
if (symlink(file_abs, cab_abs) < 0)
err(1, "symlink");
if (ctx->nargs + 1 >= ctx->argsize) {
ctx->argsize = ctx->nargs * 5 / 4 + 16;
ctx->args = sresize(ctx->args, ctx->argsize, char *);
}
ctx->args[ctx->nargs++] = cab_abs;
return 0;
}
@ -72,8 +86,13 @@ uint32_t CreateCabAddFiles(const char16_t *const *pwzFiles,
uint32_t CreateCabFinish(CabCreateContext *ctx, void (*split_callback)(void))
{
system_argv("lcab", "-r", "-n", ctx->tempdir, ctx->outfile,
(const char *)NULL);
if (ctx->nargs + 2 >= ctx->argsize) {
ctx->argsize = ctx->nargs * 5 / 4 + 16;
ctx->args = sresize(ctx->args, ctx->argsize, char *);
}
ctx->args[ctx->nargs++] = ctx->outfile;
ctx->args[ctx->nargs++] = NULL;
system_argv_array(ctx->args);
return 0;
}