Piotr Caban : msi: Remove column_info.temporary field.
Alexandre Julliard
julliard at winehq.org
Tue Jun 30 14:55:06 CDT 2020
Module: wine
Branch: master
Commit: 76a2077c83048d8eead8ea0cbfafa70406c0cd88
URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a2077c83048d8eead8ea0cbfafa70406c0cd88
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Jun 30 05:40:46 2020 +0200
msi: Remove column_info.temporary field.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/alter.c | 2 +-
dlls/msi/create.c | 2 +-
dlls/msi/msipriv.h | 3 +--
dlls/msi/sql.y | 1 -
dlls/msi/table.c | 5 +++--
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c
index 78f1a3930c..7d27211853 100644
--- a/dlls/msi/alter.c
+++ b/dlls/msi/alter.c
@@ -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);
diff --git a/dlls/msi/create.c b/dlls/msi/create.c
index 94c62ec573..3d6c5189f2 100644
--- a/dlls/msi/create.c
+++ b/dlls/msi/create.c
@@ -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;
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 6797ebe4bc..dbe833e613 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -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
diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index 8ffbcd4de5..7bdace7298 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -318,7 +318,6 @@ column_and_type:
{
$$ = $1;
$$->type = ($2 | MSITYPE_VALID);
- $$->temporary = $2 & MSITYPE_TEMPORARY ? TRUE : FALSE;
}
;
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 5a1466592f..3326958d94 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -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;
More information about the wine-cvs
mailing list