marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msidb: Permit specifying tables to import by filename. 

msidb permits tables to be imported by filename (rather than just
the name of the table) when the '.idt' extension is specified.
This feature also allows specifying tables with long filenames:
msidb -d package.msi -f . -i InstallExecuteSequence.idt

Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Erich E. Hoover 2019-03-16 11:19:26 -06:00 committed by Alexandre Julliard
parent 3d7471570e
commit dcb3747f5e
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/msidb/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = msidb.exe
APPMODE = -mconsole -municode
IMPORTS = msi
IMPORTS = msi shlwapi
C_SRCS = main.c

22
programs/msidb/main.c
View File

@ -24,6 +24,7 @@
#include <windows.h>
#include <msi.h>
#include <msiquery.h>
#include <shlwapi.h>
#include "wine/debug.h"
#include "wine/unicode.h"
@ -433,17 +434,14 @@ static int extract_streams( struct msidb_state *state )
return 1;
}
static int import_table( struct msidb_state *state, const WCHAR *table_name )
static int import_table( struct msidb_state *state, const WCHAR *table_path )
{
const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */
WCHAR table_path[MAX_PATH];
UINT ret;
snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name );
ret = MsiDatabaseImportW( state->database_handle, state->table_folder, table_path );
if (ret != ERROR_SUCCESS)
{
ERR( "Failed to import table '%s', error %d.\n", wine_dbgstr_w(table_name), ret );
ERR( "Failed to import table '%s', error %d.\n", wine_dbgstr_w(table_path), ret );
return 0;
}
return 1;
@ -451,11 +449,23 @@ static int import_table( struct msidb_state *state, const WCHAR *table_name )
static int import_tables( struct msidb_state *state )
{
const WCHAR idt_ext[] = { '.','i','d','t',0 };
struct msidb_listentry *data;
LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry )
{
if (!import_table( state, data->name ))
WCHAR *table_name = data->name;
WCHAR table_path[MAX_PATH];
WCHAR *ext;
/* permit specifying tables by filename (*.idt) */
if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0)
{
const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */
snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name );
table_name = table_path;
}
if (!import_table( state, table_name ))
return 0; /* failed, do not commit changes */
}
return 1;