Andrew Talbot : msi:
Name all or none of the formal arguments in function prototypes.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 18 08:05:04 CDT 2007
Module: wine
Branch: master
Commit: 19ef864058f4580161255798ed16de42c2fa546c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ef864058f4580161255798ed16de42c2fa546c
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Sat Jun 16 18:05:32 2007 +0100
msi: Name all or none of the formal arguments in function prototypes.
---
dlls/msi/dialog.c | 2 +-
dlls/msi/msipriv.h | 24 ++++++++++++------------
dlls/msi/query.h | 2 +-
dlls/msi/sql.y | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 73aec69..964d334 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -151,7 +151,7 @@ static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM );
static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * );
static UINT msi_dialog_button_handler( msi_dialog *, msi_control *, WPARAM );
static UINT msi_dialog_edit_handler( msi_dialog *, msi_control *, WPARAM );
-static UINT msi_dialog_radiogroup_handler( msi_dialog *, msi_control *, WPARAM param );
+static UINT msi_dialog_radiogroup_handler( msi_dialog *, msi_control *, WPARAM );
static UINT msi_dialog_evaluate_control_conditions( msi_dialog *dialog );
static LRESULT WINAPI MSIRadioGroup_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control );
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 1f2677c..fd61b5c 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -126,7 +126,7 @@ typedef struct tagMSIVIEWOPS
* To get a string value, query the database's string table with
* the integer value returned from this function.
*/
- UINT (*fetch_int)( struct tagMSIVIEW *, UINT row, UINT col, UINT *val );
+ UINT (*fetch_int)( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val );
/*
* fetch_stream - gets a stream from {row,col} in the table
@@ -134,29 +134,29 @@ typedef struct tagMSIVIEWOPS
* This function is similar to fetch_int, except fetches a
* stream instead of an integer.
*/
- UINT (*fetch_stream)( struct tagMSIVIEW *, UINT row, UINT col, IStream **stm );
+ UINT (*fetch_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm );
/*
* set_row - sets values in a row as specified by mask
*
* Similar semantics to fetch_int
*/
- UINT (*set_row)( struct tagMSIVIEW *, UINT row, MSIRECORD *rec, UINT mask );
+ UINT (*set_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask );
/*
* Inserts a new row into the database from the records contents
*/
- UINT (*insert_row)( struct tagMSIVIEW *, MSIRECORD *, BOOL temporary );
+ UINT (*insert_row)( struct tagMSIVIEW *view, MSIRECORD *record, BOOL temporary );
/*
* execute - loads the underlying data into memory so it can be read
*/
- UINT (*execute)( struct tagMSIVIEW *, MSIRECORD * );
+ UINT (*execute)( struct tagMSIVIEW *view, MSIRECORD *record );
/*
* close - clears the data read by execute from memory
*/
- UINT (*close)( struct tagMSIVIEW * );
+ UINT (*close)( struct tagMSIVIEW *view );
/*
* get_dimensions - returns the number of rows or columns in a table.
@@ -164,7 +164,7 @@ typedef struct tagMSIVIEWOPS
* The number of rows can only be queried after the execute method
* is called. The number of columns can be queried at any time.
*/
- UINT (*get_dimensions)( struct tagMSIVIEW *, UINT *rows, UINT *cols );
+ UINT (*get_dimensions)( struct tagMSIVIEW *view, UINT *rows, UINT *cols );
/*
* get_column_info - returns the name and type of a specific column
@@ -173,12 +173,12 @@ typedef struct tagMSIVIEWOPS
* the caller.
* The column information can be queried at any time.
*/
- UINT (*get_column_info)( struct tagMSIVIEW *, UINT n, LPWSTR *name, UINT *type );
+ UINT (*get_column_info)( struct tagMSIVIEW *view, UINT n, LPWSTR *name, UINT *type );
/*
* modify - not yet implemented properly
*/
- UINT (*modify)( struct tagMSIVIEW *, MSIMODIFY, MSIRECORD * );
+ UINT (*modify)( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *record );
/*
* delete - destroys the structure completely
@@ -196,7 +196,7 @@ typedef struct tagMSIVIEWOPS
* position in the iteration. It must be initialised to zero before the
* first call and continued to be passed in to subsequent calls.
*/
- UINT (*find_matching_rows)( struct tagMSIVIEW *, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle );
+ UINT (*find_matching_rows)( struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle );
} MSIVIEWOPS;
struct tagMSIVIEW
@@ -565,7 +565,7 @@ extern void msi_table_set_strref(UINT bytes_per_strref);
extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name );
extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table );
-extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname,
+extern UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname,
USHORT **pdata, UINT *psz );
extern UINT read_stream_data( IStorage *stg, LPCWSTR stname,
USHORT **pdata, UINT *psz );
@@ -637,7 +637,7 @@ extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel );
/* package internals */
extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPCWSTR );
-extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE ** );
+extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage );
extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR );
extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR );
extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * );
diff --git a/dlls/msi/query.h b/dlls/msi/query.h
index 48a1823..ef2e8a6 100644
--- a/dlls/msi/query.h
+++ b/dlls/msi/query.h
@@ -114,7 +114,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table,
UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table,
column_info *columns, column_info *values, BOOL temp );
-UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **, LPCWSTR table,
+UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table,
column_info *list, struct expr *expr );
UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table );
diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index a7180e9..902b08b 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -64,7 +64,7 @@ static struct expr * EXPR_complex( void *info, struct expr *l, UINT op, struct e
static struct expr * EXPR_unary( void *info, struct expr *l, UINT op );
static struct expr * EXPR_column( void *info, const column_info *column );
static struct expr * EXPR_ival( void *info, int val );
-static struct expr * EXPR_sval( void *info, const struct sql_str * );
+static struct expr * EXPR_sval( void *info, const struct sql_str *str );
static struct expr * EXPR_wildcard( void *info );
%}
More information about the wine-cvs
mailing list