Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] msi: Remove column_info.temporary field.

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 76a2077c83048d8eead8ea0cbfafa70406c0cd88 by Piotr Caban <piotr@codeweavers.com>
This commit is contained in:
winesync 2022-03-13 19:08:43 +01:00 committed by Mark Jansen
parent 9cf1ecf2f3
commit 791734c2e9
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/msi/alter.c
View file

@ -70,7 +70,7 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record )
if (av->colinfo)
return av->table->ops->add_column(av->table, av->colinfo->column,
av->colinfo->type, av->colinfo->temporary, av->hold == 1);
av->colinfo->type, av->hold == 1);
if (av->hold == 1)
av->table->ops->add_ref(av->table);

2
dll/win32/msi/create.c
View file

@ -181,7 +181,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table,
if (!col->table)
col->table = table;
if( !col->temporary )
if( !(col->type & MSITYPE_TEMPORARY) )
temp = FALSE;
else if ( col->type & MSITYPE_KEY )
tempprim = TRUE;

3
dll/win32/msi/msipriv.h
View file

@ -222,7 +222,6 @@ typedef struct _column_info
LPCWSTR table;
LPCWSTR column;
INT type;
BOOL temporary;
struct expr *val;
struct _column_info *next;
} column_info;
@ -337,7 +336,7 @@ typedef struct tagMSIVIEWOPS
/*
* add_column - adds a column to the table
*/
UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL temporary, BOOL hold );
UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL hold );
/*
* sort - orders the table by columns

1
dll/win32/msi/sql.y
View file

@ -318,7 +318,6 @@ column_and_type:
{
$$ = $1;
$$->type = ($2 | MSITYPE_VALID);
$$->temporary = $2 & MSITYPE_TEMPORARY ? TRUE : FALSE;
}
;

5
dll/win32/msi/table.c
View file

@ -764,7 +764,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
table->colinfo[ i ].type = col->type;
table->colinfo[ i ].offset = 0;
table->colinfo[ i ].hash_table = NULL;
table->colinfo[ i ].temporary = col->temporary;
table->colinfo[ i ].temporary = (col->type & MSITYPE_TEMPORARY) != 0;
}
table_calc_column_offsets( db, table->colinfo, table->col_count);
@ -2041,9 +2041,10 @@ static UINT TABLE_release(struct tagMSIVIEW *view)
}
static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column,
INT type, BOOL temporary, BOOL hold)
INT type, BOOL hold)
{
UINT i, r, table_id, col_id, size, offset;
BOOL temporary = type & MSITYPE_TEMPORARY;
MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
MSICOLUMNINFO *colinfo;