diff options
-rw-r--r-- | include/debug.h | 8 | ||||
-rw-r--r-- | include/libmsi.h | 72 | ||||
-rw-r--r-- | libmsi/alter.c | 10 | ||||
-rw-r--r-- | libmsi/create.c | 8 | ||||
-rw-r--r-- | libmsi/database.c | 198 | ||||
-rw-r--r-- | libmsi/delete.c | 4 | ||||
-rw-r--r-- | libmsi/distinct.c | 4 | ||||
-rw-r--r-- | libmsi/drop.c | 2 | ||||
-rw-r--r-- | libmsi/insert.c | 14 | ||||
-rw-r--r-- | libmsi/msipriv.h | 104 | ||||
-rw-r--r-- | libmsi/msiquery.c | 62 | ||||
-rw-r--r-- | libmsi/query.h | 26 | ||||
-rw-r--r-- | libmsi/record.c | 44 | ||||
-rw-r--r-- | libmsi/select.c | 10 | ||||
-rw-r--r-- | libmsi/sql-parser.y | 26 | ||||
-rw-r--r-- | libmsi/storages.c | 12 | ||||
-rw-r--r-- | libmsi/streams.c | 14 | ||||
-rw-r--r-- | libmsi/string.c | 16 | ||||
-rw-r--r-- | libmsi/suminfo.c | 60 | ||||
-rw-r--r-- | libmsi/table.c | 96 | ||||
-rw-r--r-- | libmsi/update.c | 6 | ||||
-rw-r--r-- | libmsi/where.c | 12 | ||||
-rw-r--r-- | tests/testdatabase.c | 58 | ||||
-rw-r--r-- | tests/testrecord.c | 2 | ||||
-rw-r--r-- | tests/testsuminfo.c | 2 |
25 files changed, 435 insertions, 435 deletions
diff --git a/include/debug.h b/include/debug.h index cb5da28..eeda9b6 100644 --- a/include/debug.h +++ b/include/debug.h @@ -64,10 +64,10 @@ static inline const char *wine_dbgstr_an( const char * s, int n ) } static inline const char *wine_dbgstr_wn( const WCHAR *s, int n ) { - static LPSTR p_ret[10]; + static CHAR *p_ret[10]; static int i; - LPSTR ret; + CHAR *ret; DWORD len; if (!s) return ""; @@ -82,10 +82,10 @@ static inline const char *wine_dbgstr_wn( const WCHAR *s, int n ) static inline const char *wine_dbg_sprintf( const char *format, ...) { - static LPSTR p_ret[10]; + static CHAR *p_ret[10]; static int i; - LPSTR ret; + CHAR *ret; DWORD len; va_list ap; diff --git a/include/libmsi.h b/include/libmsi.h index 6cd8480..5ce043e 100644 --- a/include/libmsi.h +++ b/include/libmsi.h @@ -151,11 +151,11 @@ extern "C" { UINT WINAPI MsiViewFetch(PMSIOBJECT,PMSIOBJECT*); UINT WINAPI MsiViewExecute(PMSIOBJECT,PMSIOBJECT); UINT WINAPI MsiViewClose(PMSIOBJECT); -UINT WINAPI MsiDatabaseOpenViewA(PMSIOBJECT,LPCSTR,PMSIOBJECT*); -UINT WINAPI MsiDatabaseOpenViewW(PMSIOBJECT,LPCWSTR,PMSIOBJECT*); +UINT WINAPI MsiDatabaseOpenViewA(PMSIOBJECT,const CHAR *,PMSIOBJECT*); +UINT WINAPI MsiDatabaseOpenViewW(PMSIOBJECT,const WCHAR *,PMSIOBJECT*); #define MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView) -MSIDBERROR WINAPI MsiViewGetErrorA(PMSIOBJECT,LPSTR,LPDWORD); -MSIDBERROR WINAPI MsiViewGetErrorW(PMSIOBJECT,LPWSTR,LPDWORD); +MSIDBERROR WINAPI MsiViewGetErrorA(PMSIOBJECT,CHAR *,DWORD *); +MSIDBERROR WINAPI MsiViewGetErrorW(PMSIOBJECT,WCHAR *,DWORD *); #define MsiViewGetError WINELIB_NAME_AW(MsiViewGetError) MSIDBSTATE WINAPI MsiGetDatabaseState(PMSIOBJECT); @@ -164,74 +164,74 @@ MSIDBSTATE WINAPI MsiGetDatabaseState(PMSIOBJECT); PMSIOBJECT WINAPI MsiCreateRecord(UINT); UINT WINAPI MsiRecordClearData(PMSIOBJECT); UINT WINAPI MsiRecordSetInteger(PMSIOBJECT,UINT,int); -UINT WINAPI MsiRecordSetStringA(PMSIOBJECT,UINT,LPCSTR); -UINT WINAPI MsiRecordSetStringW(PMSIOBJECT,UINT,LPCWSTR); +UINT WINAPI MsiRecordSetStringA(PMSIOBJECT,UINT,const CHAR *); +UINT WINAPI MsiRecordSetStringW(PMSIOBJECT,UINT,const WCHAR *); #define MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString) -UINT WINAPI MsiRecordGetStringA(PMSIOBJECT,UINT,LPSTR,LPDWORD); -UINT WINAPI MsiRecordGetStringW(PMSIOBJECT,UINT,LPWSTR,LPDWORD); +UINT WINAPI MsiRecordGetStringA(PMSIOBJECT,UINT,CHAR *,DWORD *); +UINT WINAPI MsiRecordGetStringW(PMSIOBJECT,UINT,WCHAR *,DWORD *); #define MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString) UINT WINAPI MsiRecordGetFieldCount(PMSIOBJECT); int WINAPI MsiRecordGetInteger(PMSIOBJECT,UINT); UINT WINAPI MsiRecordDataSize(PMSIOBJECT,UINT); BOOL WINAPI MsiRecordIsNull(PMSIOBJECT,UINT); -UINT WINAPI MsiFormatRecordA(PMSIOBJECT,PMSIOBJECT,LPSTR,LPDWORD); -UINT WINAPI MsiFormatRecordW(PMSIOBJECT,PMSIOBJECT,LPWSTR,LPDWORD); +UINT WINAPI MsiFormatRecordA(PMSIOBJECT,PMSIOBJECT,CHAR *,DWORD *); +UINT WINAPI MsiFormatRecordW(PMSIOBJECT,PMSIOBJECT,WCHAR *,DWORD *); #define MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord) -UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT,UINT,LPCSTR); -UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT,UINT,LPCWSTR); +UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT,UINT,const CHAR *); +UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT,UINT,const WCHAR *); #define MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream) -UINT WINAPI MsiRecordReadStream(PMSIOBJECT,UINT,char*,LPDWORD); +UINT WINAPI MsiRecordReadStream(PMSIOBJECT,UINT,char*,DWORD *); -UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT,LPCSTR,PMSIOBJECT*); -UINT WINAPI MsiDatabaseGetPrimaryKeysW(PMSIOBJECT,LPCWSTR,PMSIOBJECT*); +UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT,const CHAR *,PMSIOBJECT*); +UINT WINAPI MsiDatabaseGetPrimaryKeysW(PMSIOBJECT,const WCHAR *,PMSIOBJECT*); #define MsiDatabaseGetPrimaryKeys WINELIB_NAME_AW(MsiDatabaseGetPrimaryKeys) /* database transforms */ -UINT WINAPI MsiDatabaseApplyTransformA(PMSIOBJECT,LPCSTR,int); -UINT WINAPI MsiDatabaseApplyTransformW(PMSIOBJECT,LPCWSTR,int); +UINT WINAPI MsiDatabaseApplyTransformA(PMSIOBJECT,const CHAR *,int); +UINT WINAPI MsiDatabaseApplyTransformW(PMSIOBJECT,const WCHAR *,int); #define MsiDatabaseApplyTransform WINELIB_NAME_AW(MsiDatabaseApplyTransform) UINT WINAPI MsiViewGetColumnInfo(PMSIOBJECT, MSICOLINFO, PMSIOBJECT*); -UINT WINAPI MsiCreateTransformSummaryInfoA(PMSIOBJECT, PMSIOBJECT, LPCSTR, int, int); -UINT WINAPI MsiCreateTransformSummaryInfoW(PMSIOBJECT, PMSIOBJECT, LPCWSTR, int, int); +UINT WINAPI MsiCreateTransformSummaryInfoA(PMSIOBJECT, PMSIOBJECT, const CHAR *, int, int); +UINT WINAPI MsiCreateTransformSummaryInfoW(PMSIOBJECT, PMSIOBJECT, const WCHAR *, int, int); #define MsiCreateTransformSummaryInfo WINELIB_NAME_AW(MsiCreateTransformSummaryInfo) -UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT, LPCSTR, UINT, PMSIOBJECT *); -UINT WINAPI MsiGetSummaryInformationW(PMSIOBJECT, LPCWSTR, UINT, PMSIOBJECT *); +UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT, const CHAR *, UINT, PMSIOBJECT *); +UINT WINAPI MsiGetSummaryInformationW(PMSIOBJECT, const WCHAR *, UINT, PMSIOBJECT *); #define MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation) -UINT WINAPI MsiSummaryInfoGetPropertyA(PMSIOBJECT,UINT,PUINT,LPINT,FILETIME*,LPSTR,LPDWORD); -UINT WINAPI MsiSummaryInfoGetPropertyW(PMSIOBJECT,UINT,PUINT,LPINT,FILETIME*,LPWSTR,LPDWORD); +UINT WINAPI MsiSummaryInfoGetPropertyA(PMSIOBJECT,UINT,UINT *,INT *,FILETIME*,CHAR *,DWORD *); +UINT WINAPI MsiSummaryInfoGetPropertyW(PMSIOBJECT,UINT,UINT *,INT *,FILETIME*,WCHAR *,DWORD *); #define MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty) -UINT WINAPI MsiSummaryInfoSetPropertyA(PMSIOBJECT, UINT, UINT, INT, FILETIME*, LPCSTR); -UINT WINAPI MsiSummaryInfoSetPropertyW(PMSIOBJECT, UINT, UINT, INT, FILETIME*, LPCWSTR); +UINT WINAPI MsiSummaryInfoSetPropertyA(PMSIOBJECT, UINT, UINT, INT, FILETIME*, const CHAR *); +UINT WINAPI MsiSummaryInfoSetPropertyW(PMSIOBJECT, UINT, UINT, INT, FILETIME*, const WCHAR *); #define MsiSummaryInfoSetProperty WINELIB_NAME_AW(MsiSummaryInfoSetProperty) -UINT WINAPI MsiDatabaseExportA(PMSIOBJECT, LPCSTR, LPCSTR, LPCSTR); -UINT WINAPI MsiDatabaseExportW(PMSIOBJECT, LPCWSTR, LPCWSTR, LPCWSTR); +UINT WINAPI MsiDatabaseExportA(PMSIOBJECT, const CHAR *, const CHAR *, const CHAR *); +UINT WINAPI MsiDatabaseExportW(PMSIOBJECT, const WCHAR *, const WCHAR *, const WCHAR *); #define MsiDatabaseExport WINELIB_NAME_AW(MsiDatabaseExport) -UINT WINAPI MsiDatabaseImportA(PMSIOBJECT, LPCSTR, LPCSTR); -UINT WINAPI MsiDatabaseImportW(PMSIOBJECT, LPCWSTR, LPCWSTR); +UINT WINAPI MsiDatabaseImportA(PMSIOBJECT, const CHAR *, const CHAR *); +UINT WINAPI MsiDatabaseImportW(PMSIOBJECT, const WCHAR *, const WCHAR *); #define MsiDatabaseImport WINELIB_NAME_AW(MsiDatabaseImport) -UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LPCWSTR, PMSIOBJECT*); -UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, PMSIOBJECT*); +UINT WINAPI MsiOpenDatabaseW(const WCHAR *, const WCHAR *, PMSIOBJECT*); +UINT WINAPI MsiOpenDatabaseA(const CHAR *, const CHAR *, PMSIOBJECT*); #define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase) -MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(PMSIOBJECT, LPCSTR); -MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(PMSIOBJECT, LPCWSTR); +MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(PMSIOBJECT, const CHAR *); +MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(PMSIOBJECT, const WCHAR *); #define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent) UINT WINAPI MsiSummaryInfoPersist(PMSIOBJECT); -UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT,PUINT); +UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT,UINT *); UINT WINAPI MsiViewModify(PMSIOBJECT, MSIMODIFY, PMSIOBJECT); -UINT WINAPI MsiDatabaseMergeA(PMSIOBJECT, PMSIOBJECT, LPCSTR); -UINT WINAPI MsiDatabaseMergeW(PMSIOBJECT, PMSIOBJECT, LPCWSTR); +UINT WINAPI MsiDatabaseMergeA(PMSIOBJECT, PMSIOBJECT, const CHAR *); +UINT WINAPI MsiDatabaseMergeW(PMSIOBJECT, PMSIOBJECT, const WCHAR *); #define MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge) /* Non Unicode */ diff --git a/libmsi/alter.c b/libmsi/alter.c index 9248d45..c7ce1e3 100644 --- a/libmsi/alter.c +++ b/libmsi/alter.c @@ -68,13 +68,13 @@ static UINT ALTER_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) return av->table->ops->get_row(av->table, row, rec); } -static UINT ITERATE_columns(MSIRECORD *row, LPVOID param) +static UINT ITERATE_columns(MSIRECORD *row, void *param) { (*(UINT *)param)++; return ERROR_SUCCESS; } -static BOOL check_column_exists(MSIDATABASE *db, LPCWSTR table, LPCWSTR column) +static BOOL check_column_exists(MSIDATABASE *db, const WCHAR *table, const WCHAR *column) { MSIQUERY *view; MSIRECORD *rec; @@ -187,8 +187,8 @@ static UINT ALTER_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col return ERROR_FUNCTION_FAILED; } -static UINT ALTER_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT ALTER_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSIALTERVIEW *av = (MSIALTERVIEW*)view; @@ -250,7 +250,7 @@ static const MSIVIEWOPS alter_ops = NULL, }; -UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) +UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *name, column_info *colinfo, int hold ) { MSIALTERVIEW *av; UINT r; diff --git a/libmsi/create.c b/libmsi/create.c index 1d7eb2b..0a03565 100644 --- a/libmsi/create.c +++ b/libmsi/create.c @@ -41,7 +41,7 @@ typedef struct tagMSICREATEVIEW { MSIVIEW view; MSIDATABASE *db; - LPCWSTR name; + const WCHAR * name; BOOL bIsTemp; BOOL hold; column_info *col_info; @@ -88,8 +88,8 @@ static UINT CREATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co return ERROR_FUNCTION_FAILED; } -static UINT CREATE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT CREATE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSICREATEVIEW *cv = (MSICREATEVIEW*)view; @@ -156,7 +156,7 @@ static UINT check_columns( const column_info *col_info ) return ERROR_SUCCESS; } -UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, +UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *table, column_info *col_info, BOOL hold ) { MSICREATEVIEW *cv = NULL; diff --git a/libmsi/database.c b/libmsi/database.c index 17d6376..eaf86e4 100644 --- a/libmsi/database.c +++ b/libmsi/database.c @@ -62,7 +62,7 @@ typedef struct tagMSISTREAM { IStream *stm; } MSISTREAM; -static UINT find_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) +static UINT find_open_stream( MSIDATABASE *db, IStorage *stg, const WCHAR *name, IStream **stm ) { MSISTREAM *stream; @@ -94,7 +94,7 @@ static UINT find_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStr return ERROR_FUNCTION_FAILED; } -UINT msi_clone_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) +UINT msi_clone_open_stream( MSIDATABASE *db, IStorage *stg, const WCHAR *name, IStream **stm ) { IStream *stream; @@ -124,7 +124,7 @@ UINT msi_clone_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStrea return ERROR_FUNCTION_FAILED; } -UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) +UINT msi_get_raw_stream( MSIDATABASE *db, const WCHAR *stname, IStream **stm ) { HRESULT r; IStorage *stg; @@ -293,14 +293,14 @@ static HRESULT db_initialize( IStorage *stg, const GUID *clsid ) return S_OK; } -UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) +UINT MSI_OpenDatabaseW(const WCHAR *szDBPath, const WCHAR *szPersist, MSIDATABASE **pdb) { IStorage *stg = NULL; HRESULT r; MSIDATABASE *db = NULL; UINT ret = ERROR_FUNCTION_FAILED; - LPCWSTR szMode; - LPCWSTR save_path; + const WCHAR *szMode; + const WCHAR *save_path; STATSTG stat; BOOL created = FALSE, patch = FALSE; WCHAR path[MAX_PATH]; @@ -450,7 +450,7 @@ end: return ret; } -UINT WINAPI MsiOpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, PMSIOBJECT *phDB) +UINT WINAPI MsiOpenDatabaseW(const WCHAR *szDBPath, const WCHAR *szPersist, PMSIOBJECT *phDB) { MSIDATABASE *db; UINT ret; @@ -466,11 +466,11 @@ UINT WINAPI MsiOpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, PMSIOBJECT *ph return ret; } -UINT WINAPI MsiOpenDatabaseA(LPCSTR szDBPath, LPCSTR szPersist, PMSIOBJECT *phDB) +UINT WINAPI MsiOpenDatabaseA(const CHAR *szDBPath, const CHAR *szPersist, PMSIOBJECT *phDB) { HRESULT r = ERROR_FUNCTION_FAILED; - LPWSTR szwDBPath = NULL; - LPWSTR szwPersist = NULL; + WCHAR *szwDBPath = NULL; + WCHAR *szwPersist = NULL; TRACE("%s %s %p\n", debugstr_a(szDBPath), debugstr_a(szPersist), phDB); @@ -488,7 +488,7 @@ UINT WINAPI MsiOpenDatabaseA(LPCSTR szDBPath, LPCSTR szPersist, PMSIOBJECT *phDB goto end; } else - szwPersist = (LPWSTR)(DWORD_PTR)szPersist; + szwPersist = (WCHAR *)(DWORD_PTR)szPersist; r = MsiOpenDatabaseW( szwDBPath, szwPersist, phDB ); @@ -500,11 +500,11 @@ end: return r; } -static LPWSTR msi_read_text_archive(LPCWSTR path, DWORD *len) +static WCHAR *msi_read_text_archive(const WCHAR *path, DWORD *len) { HANDLE file; - LPSTR data = NULL; - LPWSTR wdata = NULL; + CHAR *data = NULL; + WCHAR *wdata = NULL; DWORD read, size = 0; file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); @@ -530,10 +530,10 @@ done: return wdata; } -static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries, DWORD *len) +static void msi_parse_line(WCHAR **line, WCHAR ***entries, DWORD *num_entries, DWORD *len) { - LPWSTR ptr = *line; - LPWSTR save; + WCHAR *ptr = *line; + WCHAR *save; DWORD i, count = 1, chars_left = *len; *entries = NULL; @@ -549,7 +549,7 @@ static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries, D chars_left--; } - *entries = msi_alloc(count * sizeof(LPWSTR)); + *entries = msi_alloc(count * sizeof(WCHAR *)); if (!*entries) return; @@ -600,9 +600,9 @@ static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries, D *num_entries = count; } -static LPWSTR msi_build_createsql_prelude(LPWSTR table) +static WCHAR *msi_build_createsql_prelude(WCHAR *table) { - LPWSTR prelude; + WCHAR *prelude; DWORD size; static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; @@ -616,11 +616,11 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) return prelude; } -static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, DWORD num_columns) +static WCHAR *msi_build_createsql_columns(WCHAR **columns_data, WCHAR **types, DWORD num_columns) { - LPWSTR columns; - LPWSTR p; - LPCWSTR type; + WCHAR *columns; + WCHAR *p; + const WCHAR *type; DWORD sql_size = 1, i, len; WCHAR expanded[128], *ptr; WCHAR size[10], comma[2], extra[30]; @@ -713,11 +713,11 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D return columns; } -static LPWSTR msi_build_createsql_postlude(LPWSTR *primary_keys, DWORD num_keys) +static WCHAR *msi_build_createsql_postlude(WCHAR **primary_keys, DWORD num_keys) { - LPWSTR postlude; - LPWSTR keys; - LPWSTR ptr; + WCHAR *postlude; + WCHAR *keys; + WCHAR *ptr; DWORD size, key_size, i; static const WCHAR key_fmt[] = {'`','%','s','`',',',' ',0}; @@ -752,15 +752,15 @@ done: return postlude; } -static UINT msi_add_table_to_db(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, LPWSTR *labels, DWORD num_labels, DWORD num_columns) +static UINT msi_add_table_to_db(MSIDATABASE *db, WCHAR **columns, WCHAR **types, WCHAR **labels, DWORD num_labels, DWORD num_columns) { UINT r = ERROR_OUTOFMEMORY; DWORD size; MSIQUERY *view; - LPWSTR create_sql = NULL; - LPWSTR prelude; - LPWSTR columns_sql; - LPWSTR postlude; + WCHAR *create_sql = NULL; + WCHAR *prelude; + WCHAR *columns_sql; + WCHAR *postlude; prelude = msi_build_createsql_prelude(labels[0]); columns_sql = msi_build_createsql_columns(columns, types, num_columns); @@ -794,11 +794,11 @@ done: return r; } -static LPWSTR msi_import_stream_filename(LPCWSTR path, LPCWSTR name) +static WCHAR *msi_import_stream_filename(const WCHAR *path, const WCHAR *name) { DWORD len; - LPWSTR fullname; - LPWSTR ptr; + WCHAR *fullname; + WCHAR *ptr; len = lstrlenW(path) + lstrlenW(name) + 1; fullname = msi_alloc(len*sizeof(WCHAR)); @@ -819,8 +819,8 @@ static LPWSTR msi_import_stream_filename(LPCWSTR path, LPCWSTR name) return fullname; } -static UINT construct_record(DWORD num_columns, LPWSTR *types, - LPWSTR *data, LPWSTR path, MSIRECORD **rec) +static UINT construct_record(DWORD num_columns, WCHAR **types, + WCHAR **data, WCHAR *path, MSIRECORD **rec) { UINT i; @@ -843,7 +843,7 @@ static UINT construct_record(DWORD num_columns, LPWSTR *types, if (*data[i]) { UINT r; - LPWSTR file = msi_import_stream_filename(path, data[i]); + WCHAR *file = msi_import_stream_filename(path, data[i]); if (!file) return ERROR_FUNCTION_FAILED; @@ -863,10 +863,10 @@ static UINT construct_record(DWORD num_columns, LPWSTR *types, return ERROR_SUCCESS; } -static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, - LPWSTR *labels, LPWSTR **records, +static UINT msi_add_records_to_table(MSIDATABASE *db, WCHAR **columns, WCHAR **types, + WCHAR **labels, WCHAR ***records, int num_columns, int num_records, - LPWSTR path) + WCHAR *path) { UINT r; int i; @@ -911,20 +911,20 @@ done: return r; } -static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) +static UINT MSI_DatabaseImport(MSIDATABASE *db, const WCHAR *folder, const WCHAR *file) { UINT r; DWORD len, i; DWORD num_labels, num_types; DWORD num_columns, num_records = 0; - LPWSTR *columns; - LPWSTR *types; - LPWSTR *labels; - LPWSTR path; - LPWSTR ptr; - LPWSTR data; - LPWSTR **records = NULL; - LPWSTR **temp_records; + WCHAR **columns; + WCHAR **types; + WCHAR **labels; + WCHAR *path; + WCHAR *ptr; + WCHAR *data; + WCHAR ***records = NULL; + WCHAR ***temp_records; static const WCHAR suminfo[] = {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; @@ -965,7 +965,7 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) goto done; } - records = msi_alloc(sizeof(LPWSTR *)); + records = msi_alloc(sizeof(WCHAR **)); if (!records) { r = ERROR_OUTOFMEMORY; @@ -978,7 +978,7 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) msi_parse_line( &ptr, &records[num_records], NULL, &len ); num_records++; - temp_records = msi_realloc(records, (num_records + 1) * sizeof(LPWSTR *)); + temp_records = msi_realloc(records, (num_records + 1) * sizeof(WCHAR **)); if (!temp_records) { r = ERROR_OUTOFMEMORY; @@ -1026,7 +1026,7 @@ done: return r; } -UINT WINAPI MsiDatabaseImportW(PMSIOBJECT handle, LPCWSTR szFolder, LPCWSTR szFilename) +UINT WINAPI MsiDatabaseImportW(PMSIOBJECT handle, const WCHAR *szFolder, const WCHAR *szFilename) { MSIDATABASE *db; UINT r; @@ -1042,10 +1042,10 @@ UINT WINAPI MsiDatabaseImportW(PMSIOBJECT handle, LPCWSTR szFolder, LPCWSTR szFi } UINT WINAPI MsiDatabaseImportA( PMSIOBJECT handle, - LPCSTR szFolder, LPCSTR szFilename ) + const CHAR *szFolder, const CHAR *szFilename ) { - LPWSTR path = NULL; - LPWSTR file = NULL; + WCHAR *path = NULL; + WCHAR *file = NULL; UINT r = ERROR_OUTOFMEMORY; TRACE("%x %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename)); @@ -1140,8 +1140,8 @@ static UINT msi_export_forcecodepage( HANDLE handle, UINT codepage ) return ERROR_SUCCESS; } -static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, - LPCWSTR folder, LPCWSTR file ) +static UINT MSI_DatabaseExport( MSIDATABASE *db, const WCHAR *table, + const WCHAR *folder, const WCHAR *file ) { static const WCHAR query[] = { 's','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','%','s',0 }; @@ -1149,7 +1149,7 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, '_','F','o','r','c','e','C','o','d','e','p','a','g','e',0 }; MSIRECORD *rec = NULL; MSIQUERY *view = NULL; - LPWSTR filename; + WCHAR *filename; HANDLE handle; UINT len, r; @@ -1234,8 +1234,8 @@ done: * * row4 : data <tab> data <tab> data <tab> ... data <cr> <lf> */ -UINT WINAPI MsiDatabaseExportW( PMSIOBJECT handle, LPCWSTR szTable, - LPCWSTR szFolder, LPCWSTR szFilename ) +UINT WINAPI MsiDatabaseExportW( PMSIOBJECT handle, const WCHAR *szTable, + const WCHAR *szFolder, const WCHAR *szFilename ) { MSIDATABASE *db; UINT r; @@ -1251,12 +1251,12 @@ UINT WINAPI MsiDatabaseExportW( PMSIOBJECT handle, LPCWSTR szTable, return r; } -UINT WINAPI MsiDatabaseExportA( PMSIOBJECT handle, LPCSTR szTable, - LPCSTR szFolder, LPCSTR szFilename ) +UINT WINAPI MsiDatabaseExportA( PMSIOBJECT handle, const CHAR *szTable, + const CHAR *szFolder, const CHAR *szFilename ) { - LPWSTR path = NULL; - LPWSTR file = NULL; - LPWSTR table = NULL; + WCHAR *path = NULL; + WCHAR *file = NULL; + WCHAR *table = NULL; UINT r = ERROR_OUTOFMEMORY; TRACE("%x %s %s %s\n", handle, debugstr_a(szTable), @@ -1294,10 +1294,10 @@ end: } UINT WINAPI MsiDatabaseMergeA(PMSIOBJECT hDatabase, PMSIOBJECT hDatabaseMerge, - LPCSTR szTableName) + const CHAR *szTableName) { UINT r; - LPWSTR table; + WCHAR *table; TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge, debugstr_a(szTableName)); @@ -1313,13 +1313,13 @@ typedef struct _tagMERGETABLE { struct list entry; struct list rows; - LPWSTR name; + WCHAR *name; DWORD numconflicts; - LPWSTR *columns; + WCHAR **columns; DWORD numcolumns; - LPWSTR *types; + WCHAR **types; DWORD numtypes; - LPWSTR *labels; + WCHAR **labels; DWORD numlabels; } MERGETABLE; @@ -1338,7 +1338,7 @@ typedef struct _tagMERGEDATA struct list *tabledata; } MERGEDATA; -static BOOL merge_type_match(LPCWSTR type1, LPCWSTR type2) +static BOOL merge_type_match(const WCHAR *type1, const WCHAR *type2) { if (((type1[0] == 'l') || (type1[0] == 's')) && ((type2[0] == 'l') || (type2[0] == 's'))) @@ -1411,7 +1411,7 @@ done: } static UINT merge_verify_primary_keys(MSIDATABASE *db, MSIDATABASE *mergedb, - LPCWSTR table) + const WCHAR *table) { MSIRECORD *dbrec, *mergerec = NULL; UINT r, i, count; @@ -1447,11 +1447,11 @@ done: return r; } -static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) +static WCHAR *get_key_value(MSIQUERY *view, const WCHAR *key, MSIRECORD *rec) { MSIRECORD *colnames; - LPWSTR str; - LPWSTR val; + WCHAR *str; + WCHAR *val; UINT r, i = 0, sz = 0; int cmp; @@ -1506,14 +1506,14 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) return val; } -static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, - LPWSTR table, MSIRECORD *rec) +static WCHAR *create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, + WCHAR *table, MSIRECORD *rec) { - LPWSTR query = NULL; - LPWSTR clause = NULL; - LPWSTR val; - LPCWSTR setptr; - LPCWSTR key; + WCHAR *query = NULL; + WCHAR *clause = NULL; + WCHAR *val; + const WCHAR *setptr; + const WCHAR *key; DWORD size, oldsize; MSIRECORD *keys; UINT r, i, count; @@ -1572,14 +1572,14 @@ done: return query; } -static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) +static UINT merge_diff_row(MSIRECORD *rec, void *param) { MERGEDATA *data = param; MERGETABLE *table = data->curtable; MERGEROW *mergerow; MSIQUERY *dbview = NULL; MSIRECORD *row = NULL; - LPWSTR query = NULL; + WCHAR *query = NULL; UINT r = ERROR_SUCCESS; if (TABLE_Exists(data->db, table->name)) @@ -1632,7 +1632,7 @@ done: return r; } -static UINT msi_get_table_labels(MSIDATABASE *db, LPCWSTR table, LPWSTR **labels, DWORD *numlabels) +static UINT msi_get_table_labels(MSIDATABASE *db, const WCHAR *table, WCHAR ***labels, DWORD *numlabels) { UINT r, i, count; MSIRECORD *prec = NULL; @@ -1643,7 +1643,7 @@ static UINT msi_get_table_labels(MSIDATABASE *db, LPCWSTR table, LPWSTR **labels count = MSI_RecordGetFieldCount(prec); *numlabels = count + 1; - *labels = msi_alloc((*numlabels)*sizeof(LPWSTR)); + *labels = msi_alloc((*numlabels)*sizeof(WCHAR *)); if (!*labels) { r = ERROR_OUTOFMEMORY; @@ -1661,7 +1661,7 @@ end: return r; } -static UINT msi_get_query_columns(MSIQUERY *query, LPWSTR **columns, DWORD *numcolumns) +static UINT msi_get_query_columns(MSIQUERY *query, WCHAR ***columns, DWORD *numcolumns) { UINT r, i, count; MSIRECORD *prec = NULL; @@ -1671,7 +1671,7 @@ static UINT msi_get_query_columns(MSIQUERY *query, LPWSTR **columns, DWORD *numc return r; count = MSI_RecordGetFieldCount(prec); - *columns = msi_alloc(count*sizeof(LPWSTR)); + *columns = msi_alloc(count*sizeof(WCHAR *)); if (!*columns) { r = ERROR_OUTOFMEMORY; @@ -1690,7 +1690,7 @@ end: return r; } -static UINT msi_get_query_types(MSIQUERY *query, LPWSTR **types, DWORD *numtypes) +static UINT msi_get_query_types(MSIQUERY *query, WCHAR ***types, DWORD *numtypes) { UINT r, i, count; MSIRECORD *prec = NULL; @@ -1700,7 +1700,7 @@ static UINT msi_get_query_types(MSIQUERY *query, LPWSTR **types, DWORD *numtypes return r; count = MSI_RecordGetFieldCount(prec); - *types = msi_alloc(count*sizeof(LPWSTR)); + *types = msi_alloc(count*sizeof(WCHAR *)); if (!*types) { r = ERROR_OUTOFMEMORY; @@ -1766,7 +1766,7 @@ static void free_merge_table(MERGETABLE *table) msi_free(table); } -static UINT msi_get_merge_table (MSIDATABASE *db, LPCWSTR name, MERGETABLE **ptable) +static UINT msi_get_merge_table (MSIDATABASE *db, const WCHAR *name, MERGETABLE **ptable) { UINT r; MERGETABLE *table; @@ -1814,13 +1814,13 @@ err: return r; } -static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param) +static UINT merge_diff_tables(MSIRECORD *rec, void *param) { MERGEDATA *data = param; MERGETABLE *table; MSIQUERY *dbview = NULL; MSIQUERY *mergeview = NULL; - LPCWSTR name; + const WCHAR *name; UINT r; static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ', @@ -1920,8 +1920,8 @@ static UINT merge_table(MSIDATABASE *db, MERGETABLE *table) return ERROR_SUCCESS; } -static UINT update_merge_errors(MSIDATABASE *db, LPCWSTR error, - LPWSTR table, DWORD numconflicts) +static UINT update_merge_errors(MSIDATABASE *db, const WCHAR *error, + WCHAR *table, DWORD numconflicts) { UINT r; MSIQUERY *view; @@ -1963,7 +1963,7 @@ static UINT update_merge_errors(MSIDATABASE *db, LPCWSTR error, } UINT WINAPI MsiDatabaseMergeW(PMSIOBJECT hDatabase, PMSIOBJECT hDatabaseMerge, - LPCWSTR szTableName) + const WCHAR *szTableName) { struct list tabledata = LIST_INIT(tabledata); struct list *item, *cursor; diff --git a/libmsi/delete.c b/libmsi/delete.c index a47b0e2..6ec36a4 100644 --- a/libmsi/delete.c +++ b/libmsi/delete.c @@ -124,8 +124,8 @@ static UINT DELETE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co return dv->table->ops->get_dimensions( dv->table, NULL, cols ); } -static UINT DELETE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT DELETE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; diff --git a/libmsi/distinct.c b/libmsi/distinct.c index c1b0d6c..a408f4e 100644 --- a/libmsi/distinct.c +++ b/libmsi/distinct.c @@ -202,8 +202,8 @@ static UINT DISTINCT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT * return dv->table->ops->get_dimensions( dv->table, NULL, cols ); } -static UINT DISTINCT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT DISTINCT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; diff --git a/libmsi/drop.c b/libmsi/drop.c index aca8d73..db5a7af 100644 --- a/libmsi/drop.c +++ b/libmsi/drop.c @@ -113,7 +113,7 @@ static const MSIVIEWOPS drop_ops = NULL, }; -UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, LPCWSTR name) +UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, const WCHAR *name) { MSIDROPVIEW *dv; UINT r; diff --git a/libmsi/insert.c b/libmsi/insert.c index bb25729..205b715 100644 --- a/libmsi/insert.c +++ b/libmsi/insert.c @@ -107,8 +107,8 @@ err: */ static BOOL msi_columns_in_order(MSIINSERTVIEW *iv, UINT col_count) { - LPCWSTR a; - LPCWSTR b; + const WCHAR *a; + const WCHAR *b; UINT i; for (i = 1; i <= col_count; i++) @@ -129,8 +129,8 @@ static UINT msi_arrange_record(MSIINSERTVIEW *iv, MSIRECORD **values) MSIRECORD *padded; UINT col_count, val_count; UINT r, i, colidx; - LPCWSTR a; - LPCWSTR b; + const WCHAR *a; + const WCHAR *b; r = iv->table->ops->get_dimensions(iv->table, NULL, &col_count); if (r != ERROR_SUCCESS) @@ -278,8 +278,8 @@ static UINT INSERT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co return sv->ops->get_dimensions( sv, rows, cols ); } -static UINT INSERT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT INSERT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; MSIVIEW *sv; @@ -358,7 +358,7 @@ static UINT count_column_info( const column_info *ci ) return n; } -UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, +UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *table, column_info *columns, column_info *values, BOOL temp ) { MSIINSERTVIEW *iv = NULL; diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index ae7d862..1a39fc4 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -77,9 +77,9 @@ typedef struct tagMSIDATABASE IStorage *storage; string_table *strings; UINT bytes_per_strref; - LPWSTR path; - LPWSTR deletefile; - LPCWSTR mode; + WCHAR *path; + WCHAR *deletefile; + const WCHAR *mode; UINT media_transform_offset; UINT media_transform_disk_id; struct list tables; @@ -106,7 +106,7 @@ typedef struct tagMSIFIELD { INT iVal; INT_PTR pVal; - LPWSTR szwVal; + WCHAR *szwVal; IStream *stream; } u; } MSIFIELD; @@ -120,8 +120,8 @@ typedef struct tagMSIRECORD typedef struct _column_info { - LPCWSTR table; - LPCWSTR column; + const WCHAR *table; + const WCHAR *column; INT type; BOOL temporary; struct expr *val; @@ -197,8 +197,8 @@ typedef struct tagMSIVIEWOPS * * The column information can be queried at any time. */ - UINT (*get_column_info)( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, - BOOL *temporary, LPCWSTR *table_name ); + UINT (*get_column_info)( struct tagMSIVIEW *view, UINT n, const WCHAR **name, UINT *type, + BOOL *temporary, const WCHAR **table_name ); /* * modify - not yet implemented properly @@ -236,12 +236,12 @@ typedef struct tagMSIVIEWOPS /* * add_column - adds a column to the table */ - UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number, LPCWSTR column, UINT type, BOOL hold ); + UINT (*add_column)( struct tagMSIVIEW *view, const WCHAR *table, UINT number, const WCHAR *column, UINT type, BOOL hold ); /* * remove_column - removes the column represented by table name and column number from the table */ - UINT (*remove_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number ); + UINT (*remove_column)( struct tagMSIVIEW *view, const WCHAR *table, UINT number ); /* * sort - orders the table by columns @@ -286,20 +286,20 @@ typedef struct tagMSISUMMARYINFO typedef struct { BOOL unicode; union { - LPSTR a; - LPWSTR w; + CHAR *a; + WCHAR *w; } str; } awstring; typedef struct { BOOL unicode; union { - LPCSTR a; - LPCWSTR w; + const CHAR *a; + const WCHAR *w; } str; } awcstring; -UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ); +UINT msi_strcpy_to_awstring( const WCHAR *str, awstring *awbuf, DWORD *sz ); /* handle functions */ extern void *msihandle2msiinfo(PMSIOBJECT handle, UINT type); @@ -324,7 +324,7 @@ enum StringPersistence }; extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); -extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); +extern UINT msi_string2idW( const string_table *st, const WCHAR *buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); extern HRESULT msi_init_string_table( IStorage *stg ); @@ -333,18 +333,18 @@ extern UINT msi_save_string_table( const string_table *st, IStorage *storage, UI extern UINT msi_get_string_table_codepage( const string_table *st ); extern UINT msi_set_string_table_codepage( string_table *st, UINT codepage ); -extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); -extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); +extern BOOL TABLE_Exists( MSIDATABASE *db, const WCHAR *name ); +extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, const WCHAR *table ); -extern UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, +extern UINT read_stream_data( IStorage *stg, const WCHAR *stname, BOOL table, BYTE **pdata, UINT *psz ); -extern UINT write_stream_data( IStorage *stg, LPCWSTR stname, - LPCVOID data, UINT sz, BOOL bTable ); +extern UINT write_stream_data( IStorage *stg, const WCHAR *stname, + const void *data, UINT sz, BOOL bTable ); /* transform functions */ extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ); extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, - LPCWSTR szTransformFile, int iErrorCond ); + const WCHAR *szTransformFile, int iErrorCond ); extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); /* record internals */ @@ -355,17 +355,17 @@ extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); extern MSIRECORD *MSI_CreateRecord( UINT ); extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ); extern UINT MSI_RecordSetIntPtr( MSIRECORD *, UINT, INT_PTR ); -extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ); +extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, const WCHAR *); extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ); -extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD); -extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); +extern UINT MSI_RecordGetStringW( MSIRECORD *, UINT, WCHAR *, DWORD *); +extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, CHAR *, DWORD *); extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); extern INT_PTR MSI_RecordGetIntPtr( MSIRECORD *, UINT ); -extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); +extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, DWORD *); extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); -extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ); -extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, LPCWSTR ); +extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, const WCHAR *); +extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, const WCHAR *); extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ); extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ); extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ); @@ -373,20 +373,20 @@ extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field); /* stream internals */ extern void enum_stream_names( IStorage *stg ); -extern LPWSTR encode_streamname(BOOL bTable, LPCWSTR in); -extern BOOL decode_streamname(LPCWSTR in, LPWSTR out); +extern WCHAR *encode_streamname(BOOL bTable, const WCHAR *in); +extern BOOL decode_streamname(const WCHAR *in, WCHAR *out); /* database internals */ -extern UINT msi_get_raw_stream( MSIDATABASE *, LPCWSTR, IStream ** ); +extern UINT msi_get_raw_stream( MSIDATABASE *, const WCHAR *, IStream **); extern UINT msi_clone_open_stream( MSIDATABASE *, IStorage *, const WCHAR *, IStream ** ); void msi_destroy_stream( MSIDATABASE *, const WCHAR * ); -extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ); -extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ); -extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ); -typedef UINT (*record_func)( MSIRECORD *, LPVOID ); -extern UINT MSI_IterateRecords( MSIQUERY *, LPDWORD, record_func, LPVOID ); -extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... ); -extern UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *, LPCWSTR, MSIRECORD ** ); +extern UINT MSI_OpenDatabaseW( const WCHAR *, const WCHAR *, MSIDATABASE **); +extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, const WCHAR *, MSIQUERY **); +extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, const WCHAR *, ... ); +typedef UINT (*record_func)( MSIRECORD *, void *); +extern UINT MSI_IterateRecords( MSIQUERY *, DWORD *, record_func, void *); +extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, const WCHAR *query, ... ); +extern UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *, const WCHAR *, MSIRECORD **); /* view internals */ extern UINT MSI_ViewExecute( MSIQUERY*, MSIRECORD * ); @@ -394,22 +394,22 @@ extern UINT MSI_ViewFetch( MSIQUERY*, MSIRECORD ** ); extern UINT MSI_ViewClose( MSIQUERY* ); extern UINT MSI_ViewGetColumnInfo(MSIQUERY *, MSICOLINFO, MSIRECORD **); extern UINT MSI_ViewModify( MSIQUERY *, MSIMODIFY, MSIRECORD * ); -extern UINT VIEW_find_column( MSIVIEW *, LPCWSTR, LPCWSTR, UINT * ); +extern UINT VIEW_find_column( MSIVIEW *, const WCHAR *, const WCHAR *, UINT *); extern UINT msi_view_get_row(MSIDATABASE *, MSIVIEW *, UINT, MSIRECORD **); /* summary information */ extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ); -extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ); +extern WCHAR *msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ); extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ); -extern LPWSTR msi_get_suminfo_product( IStorage *stg ); -extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ); +extern WCHAR *msi_get_suminfo_product( IStorage *stg ); +extern UINT msi_add_suminfo( MSIDATABASE *db, WCHAR ***records, int num_records, int num_columns ); /* Helpers */ extern WCHAR *msi_dup_record_field(MSIRECORD *row, INT index); -extern LPWSTR msi_dup_property( MSIDATABASE *db, LPCWSTR prop ); -extern UINT msi_set_property( MSIDATABASE *, LPCWSTR, LPCWSTR ); -extern UINT msi_get_property( MSIDATABASE *, LPCWSTR, LPWSTR, LPDWORD ); -extern int msi_get_property_int( MSIDATABASE *package, LPCWSTR prop, int def ); +extern WCHAR *msi_dup_property( MSIDATABASE *db, const WCHAR *prop ); +extern UINT msi_set_property( MSIDATABASE *, const WCHAR *, const WCHAR *); +extern UINT msi_get_property( MSIDATABASE *, const WCHAR *, WCHAR *, DWORD *); +extern int msi_get_property_int( MSIDATABASE *package, const WCHAR *prop, int def ); /* common strings */ static const WCHAR szSourceDir[] = {'S','o','u','r','c','e','D','i','r',0}; @@ -549,9 +549,9 @@ static inline BOOL msi_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } -static inline char *strdupWtoA( LPCWSTR str ) +static inline char *strdupWtoA( const WCHAR *str ) { - LPSTR ret = NULL; + CHAR *ret = NULL; DWORD len; if (!str) return ret; @@ -562,9 +562,9 @@ static inline char *strdupWtoA( LPCWSTR str ) return ret; } -static inline LPWSTR strdupAtoW( LPCSTR str ) +static inline WCHAR *strdupAtoW( const CHAR *str ) { - LPWSTR ret = NULL; + WCHAR *ret = NULL; DWORD len; if (!str) return ret; @@ -575,9 +575,9 @@ static inline LPWSTR strdupAtoW( LPCSTR str ) return ret; } -static inline LPWSTR strdupW( LPCWSTR src ) +static inline WCHAR *strdupW( const WCHAR *src ) { - LPWSTR dest; + WCHAR *dest; if (!src) return NULL; dest = msi_alloc( (lstrlenW(src)+1)*sizeof(WCHAR) ); if (dest) diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c index bc56e5f..d293a69 100644 --- a/libmsi/msiquery.c +++ b/libmsi/msiquery.c @@ -54,10 +54,10 @@ static void MSI_CloseView( MSIOBJECT *arg ) } } -UINT VIEW_find_column( MSIVIEW *table, LPCWSTR name, LPCWSTR table_name, UINT *n ) +UINT VIEW_find_column( MSIVIEW *table, const WCHAR *name, const WCHAR *table_name, UINT *n ) { - LPCWSTR col_name; - LPCWSTR haystack_table_name; + const WCHAR *col_name; + const WCHAR *haystack_table_name; UINT i, count, r; r = table->ops->get_dimensions( table, NULL, &count ); @@ -85,10 +85,10 @@ UINT VIEW_find_column( MSIVIEW *table, LPCWSTR name, LPCWSTR table_name, UINT *n } UINT WINAPI MsiDatabaseOpenViewA(PMSIOBJECT hdb, - LPCSTR szQuery, PMSIOBJECT *phView) + const CHAR *szQuery, PMSIOBJECT *phView) { UINT r; - LPWSTR szwQuery; + WCHAR *szwQuery; TRACE("%d %s %p\n", hdb, debugstr_a(szQuery), phView); @@ -108,7 +108,7 @@ UINT WINAPI MsiDatabaseOpenViewA(PMSIOBJECT hdb, } UINT MSI_DatabaseOpenViewW(MSIDATABASE *db, - LPCWSTR szQuery, MSIQUERY **pView) + const WCHAR *szQuery, MSIQUERY **pView) { MSIQUERY *query; UINT r; @@ -139,11 +139,11 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db, return r; } -UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) +UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, const WCHAR *fmt, ... ) { UINT r; int size = 100, res; - LPWSTR query; + WCHAR *query; /* construct the string */ for (;;) @@ -164,8 +164,8 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) return r; } -UINT MSI_IterateRecords( MSIQUERY *view, LPDWORD count, - record_func func, LPVOID param ) +UINT MSI_IterateRecords( MSIQUERY *view, DWORD *count, + record_func func, void *param ) { MSIRECORD *rec = NULL; UINT r, n = 0, max = 0; @@ -202,13 +202,13 @@ UINT MSI_IterateRecords( MSIQUERY *view, LPDWORD count, } /* return a single record from a query */ -MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR fmt, ... ) +MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, const WCHAR *fmt, ... ) { MSIRECORD *rec = NULL; MSIQUERY *view = NULL; UINT r; int size = 100, res; - LPWSTR query; + WCHAR *query; /* construct the string */ for (;;) @@ -238,7 +238,7 @@ MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR fmt, ... ) } UINT WINAPI MsiDatabaseOpenViewW(PMSIOBJECT hdb, - LPCWSTR szQuery, PMSIOBJECT *phView) + const WCHAR *szQuery, PMSIOBJECT *phView) { MSIDATABASE *db; MSIQUERY *query = NULL; @@ -319,7 +319,7 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (type & MSITYPE_STRING) { - LPCWSTR sval; + const WCHAR *sval; sval = msi_string_lookup_id(db->strings, ival); MSI_RecordSetStringW(*rec, i, sval); @@ -502,7 +502,7 @@ UINT MSI_ViewGetColumnInfo( MSIQUERY *query, MSICOLINFO info, MSIRECORD **prec ) UINT r = ERROR_FUNCTION_FAILED, i, count = 0, type; MSIRECORD *rec; MSIVIEW *view = query->view; - LPCWSTR name; + const WCHAR *name; BOOL temporary; if( !view ) @@ -608,7 +608,7 @@ UINT WINAPI MsiViewModify( PMSIOBJECT hView, MSIMODIFY eModifyMode, return r; } -MSIDBERROR WINAPI MsiViewGetErrorW( PMSIOBJECT handle, LPWSTR buffer, LPDWORD buflen ) +MSIDBERROR WINAPI MsiViewGetErrorW( PMSIOBJECT handle, WCHAR *buffer, DWORD *buflen ) { MSIQUERY *query; const WCHAR *column; @@ -640,7 +640,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( PMSIOBJECT handle, LPWSTR buffer, LPDWORD bu return r; } -MSIDBERROR WINAPI MsiViewGetErrorA( PMSIOBJECT handle, LPSTR buffer, LPDWORD buflen ) +MSIDBERROR WINAPI MsiViewGetErrorA( PMSIOBJECT handle, CHAR *buffer, DWORD *buflen ) { MSIQUERY *query; const WCHAR *column; @@ -679,7 +679,7 @@ PMSIOBJECT WINAPI MsiGetLastErrorRecord( void ) } UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, - LPCWSTR szTransformFile, int iErrorCond ) + const WCHAR *szTransformFile, int iErrorCond ) { HRESULT r; UINT ret = ERROR_FUNCTION_FAILED; @@ -715,7 +715,7 @@ end: } UINT WINAPI MsiDatabaseApplyTransformW( PMSIOBJECT hdb, - LPCWSTR szTransformFile, int iErrorCond) + const WCHAR *szTransformFile, int iErrorCond) { MSIDATABASE *db; UINT r; @@ -729,9 +729,9 @@ UINT WINAPI MsiDatabaseApplyTransformW( PMSIOBJECT hdb, } UINT WINAPI MsiDatabaseApplyTransformA( PMSIOBJECT hdb, - LPCSTR szTransformFile, int iErrorCond) + const CHAR *szTransformFile, int iErrorCond) { - LPWSTR wstr; + WCHAR *wstr; UINT ret; TRACE("%d %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond); @@ -788,11 +788,11 @@ struct msi_primary_key_record_info MSIRECORD *rec; }; -static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param ) +static UINT msi_primary_key_iterator( MSIRECORD *rec, void *param ) { struct msi_primary_key_record_info *info = param; - LPCWSTR name; - LPCWSTR table; + const WCHAR *name; + const WCHAR *table; DWORD type; type = MSI_RecordGetInteger( rec, 4 ); @@ -816,7 +816,7 @@ static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param ) } UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, - LPCWSTR table, MSIRECORD **prec ) + const WCHAR *table, MSIRECORD **prec ) { static const WCHAR sql[] = { 's','e','l','e','c','t',' ','*',' ', @@ -857,7 +857,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, } UINT WINAPI MsiDatabaseGetPrimaryKeysW( PMSIOBJECT hdb, - LPCWSTR table, PMSIOBJECT* phRec ) + const WCHAR *table, PMSIOBJECT* phRec ) { MSIRECORD *rec = NULL; MSIDATABASE *db; @@ -878,9 +878,9 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( PMSIOBJECT hdb, } UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT hdb, - LPCSTR table, PMSIOBJECT* phRec) + const CHAR *table, PMSIOBJECT* phRec) { - LPWSTR szwTable = NULL; + WCHAR *szwTable = NULL; UINT r; TRACE("%d %s %p\n", hdb, debugstr_a(table), phRec); @@ -898,9 +898,9 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT hdb, } MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( - PMSIOBJECT hDatabase, LPCSTR szTableName) + PMSIOBJECT hDatabase, const CHAR *szTableName) { - LPWSTR szwTableName = NULL; + WCHAR *szwTableName = NULL; MSICONDITION r; TRACE("%x %s\n", hDatabase, debugstr_a(szTableName)); @@ -918,7 +918,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( } MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( - PMSIOBJECT hDatabase, LPCWSTR szTableName) + PMSIOBJECT hDatabase, const WCHAR *szTableName) { MSIDATABASE *db; MSICONDITION r; diff --git a/libmsi/query.h b/libmsi/query.h index 7350896..16a7d1c 100644 --- a/libmsi/query.h +++ b/libmsi/query.h @@ -58,7 +58,7 @@ #define EXPR_UNARY 12 struct sql_str { - LPCWSTR data; + const WCHAR *data; INT len; }; @@ -74,8 +74,8 @@ union ext_column { struct { - LPCWSTR column; - LPCWSTR table; + const WCHAR *column; + const WCHAR *table; } unparsed; struct { @@ -92,15 +92,15 @@ struct expr struct complex_expr expr; INT ival; UINT uval; - LPCWSTR sval; + const WCHAR *sval; union ext_column column; } u; }; -UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, +UINT MSI_ParseSQL( MSIDATABASE *db, const WCHAR *command, MSIVIEW **phview, struct list *mem ); -UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ); +UINT TABLE_CreateView( MSIDATABASE *db, const WCHAR *name, MSIVIEW **view ); UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, const column_info *columns ); @@ -110,33 +110,33 @@ UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, column_info *columns ); -UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, +UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, WCHAR *tables, struct expr *cond ); -UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, +UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *table, column_info *col_info, BOOL hold ); -UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, +UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *table, column_info *columns, column_info *values, BOOL temp ); -UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, WCHAR *table, column_info *list, struct expr *expr ); UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ); +UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *name, column_info *colinfo, int hold ); UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ); UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ); +UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *name ); int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip); MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ); -UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, +UINT msi_create_table( MSIDATABASE *db, const WCHAR *name, column_info *col_info, MSICONDITION persistent ); #pragma GCC visibility pop diff --git a/libmsi/record.c b/libmsi/record.c index bfa4b58..17672be 100644 --- a/libmsi/record.c +++ b/libmsi/record.c @@ -123,10 +123,10 @@ UINT WINAPI MsiRecordGetFieldCount( PMSIOBJECT handle ) return ret; } -static BOOL string2intW( LPCWSTR str, int *out ) +static BOOL string2intW( const WCHAR *str, int *out ) { int x = 0; - LPCWSTR p = str; + const WCHAR *p = str; if( *p == '-' ) /* skip the minus sign */ p++; @@ -157,7 +157,7 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, r = ERROR_FUNCTION_FAILED; else if ( in_rec != out_rec || in_n != out_n ) { - LPWSTR str; + WCHAR *str; MSIFIELD *in, *out; in = &in_rec->fields[in_n]; @@ -368,7 +368,7 @@ BOOL WINAPI MsiRecordIsNull( PMSIOBJECT handle, UINT iField ) } UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, - LPSTR szValue, LPDWORD pcchValue) + CHAR *szValue, DWORD *pcchValue) { UINT len=0, ret; CHAR buffer[16]; @@ -421,7 +421,7 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, } UINT WINAPI MsiRecordGetStringA(PMSIOBJECT handle, UINT iField, - LPSTR szValue, LPDWORD pcchValue) + CHAR *szValue, DWORD *pcchValue) { MSIRECORD *rec; UINT ret; @@ -450,7 +450,7 @@ const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField ) } UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, - LPWSTR szValue, LPDWORD pcchValue) + WCHAR *szValue, DWORD *pcchValue) { UINT len=0, ret; WCHAR buffer[16]; @@ -497,7 +497,7 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, } UINT WINAPI MsiRecordGetStringW(PMSIOBJECT handle, UINT iField, - LPWSTR szValue, LPDWORD pcchValue) + WCHAR *szValue, DWORD *pcchValue) { MSIRECORD *rec; UINT ret; @@ -564,9 +564,9 @@ UINT WINAPI MsiRecordDataSize(PMSIOBJECT handle, UINT iField) return ret; } -static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue ) +static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, const CHAR *szValue ) { - LPWSTR str; + WCHAR *str; TRACE("%p %d %s\n", rec, iField, debugstr_a(szValue)); @@ -589,7 +589,7 @@ static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue ) return 0; } -UINT WINAPI MsiRecordSetStringA( PMSIOBJECT handle, UINT iField, LPCSTR szValue ) +UINT WINAPI MsiRecordSetStringA( PMSIOBJECT handle, UINT iField, const CHAR *szValue ) { MSIRECORD *rec; UINT ret; @@ -606,9 +606,9 @@ UINT WINAPI MsiRecordSetStringA( PMSIOBJECT handle, UINT iField, LPCSTR szValue return ret; } -UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) +UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, const WCHAR *szValue ) { - LPWSTR str; + WCHAR *str; TRACE("%p %d %s\n", rec, iField, debugstr_w(szValue)); @@ -632,7 +632,7 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) return 0; } -UINT WINAPI MsiRecordSetStringW( PMSIOBJECT handle, UINT iField, LPCWSTR szValue ) +UINT WINAPI MsiRecordSetStringW( PMSIOBJECT handle, UINT iField, const WCHAR *szValue ) { MSIRECORD *rec; UINT ret; @@ -651,7 +651,7 @@ UINT WINAPI MsiRecordSetStringW( PMSIOBJECT handle, UINT iField, LPCWSTR szValue } /* read the data in a file into an IStream */ -static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) +static UINT RECORD_StreamFromFile(const WCHAR *szFile, IStream **pstm) { DWORD sz, szHighWord = 0, read; HANDLE handle; @@ -712,7 +712,7 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) return ERROR_SUCCESS; } -UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) +UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, const WCHAR *szFilename) { IStream *stm = NULL; HRESULT r; @@ -752,9 +752,9 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilenam return ERROR_SUCCESS; } -UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT hRecord, UINT iField, LPCSTR szFilename) +UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT hRecord, UINT iField, const CHAR *szFilename) { - LPWSTR wstr = NULL; + WCHAR *wstr = NULL; UINT ret; TRACE("%d %d %s\n", hRecord, iField, debugstr_a(szFilename)); @@ -771,7 +771,7 @@ UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT hRecord, UINT iField, LPCSTR szFilena return ret; } -UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT handle, UINT iField, LPCWSTR szFilename) +UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT handle, UINT iField, const WCHAR *szFilename) { MSIRECORD *rec; UINT ret; @@ -789,7 +789,7 @@ UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT handle, UINT iField, LPCWSTR szFilena return ret; } -UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz) +UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, DWORD *sz) { ULONG count; HRESULT r; @@ -847,7 +847,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz) return ERROR_SUCCESS; } -UINT WINAPI MsiRecordReadStream(PMSIOBJECT handle, UINT iField, char *buf, LPDWORD sz) +UINT WINAPI MsiRecordReadStream(PMSIOBJECT handle, UINT iField, char *buf, DWORD *sz) { MSIRECORD *rec; UINT ret; @@ -896,7 +896,7 @@ UINT MSI_RecordGetIStream( MSIRECORD *rec, UINT iField, IStream **pstm) return ERROR_SUCCESS; } -static UINT msi_dump_stream_to_file( IStream *stm, LPCWSTR name ) +static UINT msi_dump_stream_to_file( IStream *stm, const WCHAR *name ) { ULARGE_INTEGER size; LARGE_INTEGER pos; @@ -928,7 +928,7 @@ end: return ERROR_SUCCESS; } -UINT MSI_RecordStreamToFile( MSIRECORD *rec, UINT iField, LPCWSTR name ) +UINT MSI_RecordStreamToFile( MSIRECORD *rec, UINT iField, const WCHAR *name ) { IStream *stm = NULL; UINT r; diff --git a/libmsi/select.c b/libmsi/select.c index 31a861d..5ed94b3 100644 --- a/libmsi/select.c +++ b/libmsi/select.c @@ -214,8 +214,8 @@ static UINT SELECT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co return sv->table->ops->get_dimensions( sv->table, rows, NULL ); } -static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; @@ -244,7 +244,7 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; UINT r, i, num_columns, col, type, val; - LPCWSTR str; + const WCHAR *str; MSIRECORD *mod; r = SELECT_get_dimensions(view, NULL, &num_columns); @@ -370,8 +370,8 @@ static const MSIVIEWOPS select_ops = NULL, }; -static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, - LPCWSTR table_name ) +static UINT SELECT_AddColumn( MSISELECTVIEW *sv, const WCHAR *name, + const WCHAR *table_name ) { UINT r, n; MSIVIEW *table; diff --git a/libmsi/sql-parser.y b/libmsi/sql-parser.y index ab28ed9..221b9c1 100644 --- a/libmsi/sql-parser.y +++ b/libmsi/sql-parser.y @@ -43,7 +43,7 @@ static int sql_error(const char *str); typedef struct tag_SQL_input { MSIDATABASE *db; - LPCWSTR command; + const WCHAR *command; DWORD n, len; UINT r; MSIVIEW **view; /* View structure for the resulting query. This value @@ -53,13 +53,13 @@ typedef struct tag_SQL_input struct list *mem; } SQL_input; -static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ); +static UINT SQL_getstring( void *info, const struct sql_str *strdata, WCHAR **str ); static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); -static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ); +static WCHAR *parser_add_table( void *info, const WCHAR *list, const WCHAR *table ); static void *parser_alloc( void *info, unsigned int sz ); -static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ); +static column_info *parser_alloc_column( void *info, const WCHAR *table, const WCHAR *column ); static BOOL SQL_MarkPrimaryKeys( column_info **cols, column_info *keys); @@ -82,7 +82,7 @@ static struct expr * EXPR_wildcard( void *info ); %union { struct sql_str str; - LPWSTR string; + WCHAR *string; column_info *column_list; MSIVIEW *query; struct expr *expr; @@ -752,11 +752,11 @@ number: %% -static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ) +static WCHAR *parser_add_table( void *info, const WCHAR *list, const WCHAR *table ) { static const WCHAR space[] = {' ',0}; DWORD len = strlenW( list ) + strlenW( table ) + 2; - LPWSTR ret; + WCHAR *ret; ret = parser_alloc( info, len * sizeof(WCHAR) ); if( ret ) @@ -778,7 +778,7 @@ static void *parser_alloc( void *info, unsigned int sz ) return &mem[1]; } -static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ) +static column_info *parser_alloc_column( void *info, const WCHAR *table, const WCHAR *column ) { column_info *col; @@ -821,9 +821,9 @@ static int sql_lex( void *SQL_lval, SQL_input *sql ) return token; } -UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ) +UINT SQL_getstring( void *info, const struct sql_str *strdata, WCHAR **str ) { - LPCWSTR p = strdata->data; + const WCHAR *p = strdata->data; UINT len = strdata->len; /* match quotes */ @@ -850,7 +850,7 @@ UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ) INT SQL_getint( void *info ) { SQL_input* sql = (SQL_input*) info; - LPCWSTR p = &sql->command[sql->n]; + const WCHAR *p = &sql->command[sql->n]; INT i, r = 0; for( i=0; i<sql->len; i++ ) @@ -936,7 +936,7 @@ static struct expr * EXPR_sval( void *info, const struct sql_str *str ) if( e ) { e->type = EXPR_SVAL; - if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) + if( SQL_getstring( info, str, (WCHAR **)&e->u.sval ) != ERROR_SUCCESS ) return NULL; /* e will be freed by query destructor */ } return e; @@ -998,7 +998,7 @@ static BOOL SQL_MarkPrimaryKeys( column_info **cols, return found; } -UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, +UINT MSI_ParseSQL( MSIDATABASE *db, const WCHAR *command, MSIVIEW **phview, struct list *mem ) { SQL_input sql; diff --git a/libmsi/storages.c b/libmsi/storages.c index 7d20844..ca8f04b 100644 --- a/libmsi/storages.c +++ b/libmsi/storages.c @@ -66,7 +66,7 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) return TRUE; } -static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) +static STORAGE *create_storage(MSISTORAGESVIEW *sv, const WCHAR *name, IStorage *stg) { STORAGE *storage; @@ -125,7 +125,7 @@ static HRESULT stream_to_storage(IStream *stm, IStorage **stg) { ILockBytes *lockbytes = NULL; STATSTG stat; - LPVOID data; + void *data; HRESULT hr; DWORD size, read; ULARGE_INTEGER offset; @@ -175,7 +175,7 @@ static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; IStorage *stg, *substg = NULL; IStream *stm; - LPWSTR name = NULL; + WCHAR *name = NULL; HRESULT hr; UINT r = ERROR_FUNCTION_FAILED; @@ -277,8 +277,8 @@ static UINT STORAGES_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *c return ERROR_SUCCESS; } -static UINT STORAGES_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT STORAGES_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -305,7 +305,7 @@ static UINT STORAGES_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR * static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row) { - LPCWSTR str; + const WCHAR *str; UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); diff --git a/libmsi/streams.c b/libmsi/streams.c index 7fbe970..72ab8be 100644 --- a/libmsi/streams.c +++ b/libmsi/streams.c @@ -65,7 +65,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) return TRUE; } -static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) +static STREAM *create_stream(MSISTREAMSVIEW *sv, const WCHAR *name, BOOL encoded, IStream *stm) { STREAM *stream; WCHAR decoded[MAX_STREAM_NAME_LEN]; @@ -133,8 +133,8 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U STREAM *stream; IStream *stm; STATSTG stat; - LPWSTR encname = NULL; - LPWSTR name = NULL; + WCHAR *encname = NULL; + WCHAR *name = NULL; USHORT *data = NULL; HRESULT hr; ULONG count; @@ -266,8 +266,8 @@ static UINT STREAMS_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *co return ERROR_SUCCESS; } -static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -294,7 +294,7 @@ static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *n static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) { - LPCWSTR str; + const WCHAR *str; UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); @@ -463,7 +463,7 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) STREAM *stream = NULL; HRESULT hr; UINT r, count = 0, size; - LPWSTR encname; + WCHAR *encname; hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum); if (FAILED(hr)) diff --git a/libmsi/string.c b/libmsi/string.c index adc2788..5a32575 100644 --- a/libmsi/string.c +++ b/libmsi/string.c @@ -43,7 +43,7 @@ struct msistring { USHORT persistent_refcount; USHORT nonpersistent_refcount; - LPWSTR str; + WCHAR *str; }; struct string_table @@ -192,7 +192,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, WCHAR *str, USHORT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -213,11 +213,11 @@ static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, st->freeslot = n + 1; } -static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) +static UINT msi_string2idA( const string_table *st, const CHAR *buffer, UINT *id ) { DWORD sz; UINT r = ERROR_INVALID_PARAMETER; - LPWSTR str; + WCHAR *str; TRACE("Finding string %s in string table\n", debugstr_a(buffer) ); @@ -243,7 +243,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { - LPWSTR str; + WCHAR *str; int sz; if( !data ) @@ -295,7 +295,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { UINT n; - LPWSTR str; + WCHAR *str; if( !data ) return 0; @@ -357,7 +357,7 @@ const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ) * * Returned string is not nul terminated. */ -static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) +static UINT msi_id2stringA( const string_table *st, UINT id, CHAR *buffer, UINT *sz ) { UINT len, lenW; const WCHAR *str; @@ -386,7 +386,7 @@ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT * [in] str - string to find in the string table * [out] id - id of the string, if found */ -UINT msi_string2idW( const string_table *st, LPCWSTR str, UINT *id ) +UINT msi_string2idW( const string_table *st, const WCHAR *str, UINT *id ) { int i, c, low = 0, high = st->sortcount - 1; diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c index 69ce4ad..d7e96a3 100644 --- a/libmsi/suminfo.c +++ b/libmsi/suminfo.c @@ -87,7 +87,7 @@ static HRESULT (WINAPI *pPropVariantChangeType) static void free_prop( PROPVARIANT *prop ) { - if (prop->vt == VT_LPSTR ) + if (prop->vt == VT_LPSTR) msi_free( prop->pszVal ); prop->vt = VT_EMPTY; } @@ -163,7 +163,7 @@ static UINT propvar_changetype(PROPVARIANT *changed, PROPVARIANT *property, VART } /* FIXME: doesn't deal with endian conversion */ -static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz ) +static void read_properties_from_data( PROPVARIANT *prop, BYTE *data, DWORD sz ) { UINT type; DWORD i, size; @@ -206,9 +206,9 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz } property.vt = propdata->type; - if( propdata->type == VT_LPSTR ) + if( propdata->type == VT_LPSTR) { - LPSTR str = msi_alloc( propdata->u.str.len ); + CHAR *str = msi_alloc( propdata->u.str.len ); memcpy( str, propdata->u.str.str, propdata->u.str.len ); str[ propdata->u.str.len - 1 ] = 0; property.pszVal = str; @@ -239,7 +239,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm ) PROPERTYSETHEADER set_hdr; FORMATIDOFFSET format_hdr; PROPERTYSECTIONHEADER section_hdr; - LPBYTE data = NULL; + BYTE *data = NULL; LARGE_INTEGER ofs; ULONG count, sz; HRESULT r; @@ -303,7 +303,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm ) return ret; } -static DWORD write_dword( LPBYTE data, DWORD ofs, DWORD val ) +static DWORD write_dword( BYTE *data, DWORD ofs, DWORD val ) { if( data ) { @@ -315,14 +315,14 @@ static DWORD write_dword( LPBYTE data, DWORD ofs, DWORD val ) return 4; } -static DWORD write_filetime( LPBYTE data, DWORD ofs, const FILETIME *ft ) +static DWORD write_filetime( BYTE *data, DWORD ofs, const FILETIME *ft ) { write_dword( data, ofs, ft->dwLowDateTime ); write_dword( data, ofs + 4, ft->dwHighDateTime ); return 8; } -static DWORD write_string( LPBYTE data, DWORD ofs, LPCSTR str ) +static DWORD write_string( BYTE *data, DWORD ofs, const CHAR *str ) { DWORD len = lstrlenA( str ) + 1; write_dword( data, ofs, len ); @@ -331,7 +331,7 @@ static DWORD write_string( LPBYTE data, DWORD ofs, LPCSTR str ) return (7 + len) & ~3; } -static UINT write_property_to_data( const PROPVARIANT *prop, LPBYTE data ) +static UINT write_property_to_data( const PROPVARIANT *prop, BYTE *data ) { DWORD sz = 0; @@ -365,7 +365,7 @@ static UINT save_summary_info( const MSISUMMARYINFO * si, IStream *stm ) FORMATIDOFFSET format_hdr; PROPERTYSECTIONHEADER section_hdr; PROPERTYIDOFFSET idofs[MSI_MAX_PROPS]; - LPBYTE data = NULL; + BYTE *data = NULL; ULONG count, sz; HRESULT r; int i; @@ -457,7 +457,7 @@ MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ) } UINT WINAPI MsiGetSummaryInformationW( PMSIOBJECT hDatabase, - LPCWSTR szDatabase, UINT uiUpdateCount, PMSIOBJECT *pHandle ) + const WCHAR *szDatabase, UINT uiUpdateCount, PMSIOBJECT *pHandle ) { MSISUMMARYINFO *si; MSIDATABASE *db; @@ -471,7 +471,7 @@ UINT WINAPI MsiGetSummaryInformationW( PMSIOBJECT hDatabase, if( szDatabase && szDatabase[0] ) { - LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; + const WCHAR *persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; ret = MSI_OpenDatabaseW( szDatabase, persist, &db ); if( ret != ERROR_SUCCESS ) @@ -496,9 +496,9 @@ UINT WINAPI MsiGetSummaryInformationW( PMSIOBJECT hDatabase, } UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT hDatabase, - LPCSTR szDatabase, UINT uiUpdateCount, PMSIOBJECT *pHandle) + const CHAR *szDatabase, UINT uiUpdateCount, PMSIOBJECT *pHandle) { - LPWSTR szwDatabase = NULL; + WCHAR *szwDatabase = NULL; UINT ret; TRACE("%d %s %d %p\n", hDatabase, debugstr_a(szDatabase), @@ -518,7 +518,7 @@ UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT hDatabase, return ret; } -UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT hSummaryInfo, PUINT pCount) +UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT hSummaryInfo, UINT *pCount) { MSISUMMARYINFO *si; @@ -605,14 +605,14 @@ static UINT get_prop( PMSIOBJECT handle, UINT uiProperty, UINT *puiDataType, return ret; } -LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) +WCHAR *msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) { PROPVARIANT *prop; if ( uiProperty >= MSI_MAX_PROPS ) return NULL; prop = &si->property[uiProperty]; - if( prop->vt != VT_LPSTR ) + if( prop->vt != VT_LPSTR) return NULL; return strdupAtoW( prop->pszVal ); } @@ -629,10 +629,10 @@ INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) return prop->lVal; } -LPWSTR msi_get_suminfo_product( IStorage *stg ) +WCHAR *msi_get_suminfo_product( IStorage *stg ) { MSISUMMARYINFO *si; - LPWSTR prod; + WCHAR *prod; si = MSI_GetSummaryInformationW( stg, 0 ); if (!si) @@ -646,8 +646,8 @@ LPWSTR msi_get_suminfo_product( IStorage *stg ) } UINT WINAPI MsiSummaryInfoGetPropertyA( - PMSIOBJECT handle, UINT uiProperty, PUINT puiDataType, LPINT piValue, - FILETIME *pftValue, LPSTR szValueBuf, LPDWORD pcchValueBuf) + PMSIOBJECT handle, UINT uiProperty, UINT *puiDataType, INT *piValue, + FILETIME *pftValue, CHAR *szValueBuf, DWORD *pcchValueBuf) { awstring str; @@ -662,8 +662,8 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( } UINT WINAPI MsiSummaryInfoGetPropertyW( - PMSIOBJECT handle, UINT uiProperty, PUINT puiDataType, LPINT piValue, - FILETIME *pftValue, LPWSTR szValueBuf, LPDWORD pcchValueBuf) + PMSIOBJECT handle, UINT uiProperty, UINT *puiDataType, INT *piValue, + FILETIME *pftValue, WCHAR *szValueBuf, DWORD *pcchValueBuf) { awstring str; @@ -733,7 +733,7 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, } UINT WINAPI MsiSummaryInfoSetPropertyW( PMSIOBJECT handle, UINT uiProperty, - UINT uiDataType, INT iValue, FILETIME* pftValue, LPCWSTR szValue ) + UINT uiDataType, INT iValue, FILETIME* pftValue, const WCHAR *szValue ) { awcstring str; MSISUMMARYINFO *si; @@ -765,7 +765,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( PMSIOBJECT handle, UINT uiProperty, } UINT WINAPI MsiSummaryInfoSetPropertyA( PMSIOBJECT handle, UINT uiProperty, - UINT uiDataType, INT iValue, FILETIME* pftValue, LPCSTR szValue ) + UINT uiDataType, INT iValue, FILETIME* pftValue, const CHAR *szValue ) { awcstring str; MSISUMMARYINFO *si; @@ -813,7 +813,7 @@ static UINT suminfo_persist( MSISUMMARYINFO *si ) return ret; } -static void parse_filetime( LPCWSTR str, FILETIME *ft ) +static void parse_filetime( const WCHAR *str, FILETIME *ft ) { SYSTEMTIME lt, utc; const WCHAR *p = str; @@ -853,7 +853,7 @@ static void parse_filetime( LPCWSTR str, FILETIME *ft ) SystemTimeToFileTime( &utc, ft ); } -static UINT parse_prop( LPCWSTR prop, LPCWSTR value, UINT *pid, INT *int_value, +static UINT parse_prop( const WCHAR *prop, const WCHAR *value, UINT *pid, INT *int_value, FILETIME *ft_value, awcstring *str_value ) { *pid = atoiW( prop ); @@ -894,7 +894,7 @@ static UINT parse_prop( LPCWSTR prop, LPCWSTR value, UINT *pid, INT *int_value, return ERROR_SUCCESS; } -UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) +UINT msi_add_suminfo( MSIDATABASE *db, WCHAR ***records, int num_records, int num_columns ) { UINT r = ERROR_FUNCTION_FAILED; DWORD i, j; @@ -951,7 +951,7 @@ UINT WINAPI MsiSummaryInfoPersist( PMSIOBJECT handle ) return ret; } -UINT WINAPI MsiCreateTransformSummaryInfoA( PMSIOBJECT db, PMSIOBJECT db_ref, LPCSTR transform, int error, int validation ) +UINT WINAPI MsiCreateTransformSummaryInfoA( PMSIOBJECT db, PMSIOBJECT db_ref, const CHAR *transform, int error, int validation ) { UINT r; WCHAR *transformW = NULL; @@ -966,7 +966,7 @@ UINT WINAPI MsiCreateTransformSummaryInfoA( PMSIOBJECT db, PMSIOBJECT db_ref, LP return r; } -UINT WINAPI MsiCreateTransformSummaryInfoW( PMSIOBJECT db, PMSIOBJECT db_ref, LPCWSTR transform, int error, int validation ) +UINT WINAPI MsiCreateTransformSummaryInfoW( PMSIOBJECT db, PMSIOBJECT db_ref, const WCHAR *transform, int error, int validation ) { FIXME("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation); return ERROR_FUNCTION_FAILED; diff --git a/libmsi/table.c b/libmsi/table.c index 4ef0dca..d5013f1 100644 --- a/libmsi/table.c +++ b/libmsi/table.c @@ -50,9 +50,9 @@ typedef struct tagMSICOLUMNHASHENTRY typedef struct tagMSICOLUMNINFO { - LPCWSTR tablename; + const WCHAR *tablename; UINT number; - LPCWSTR colname; + const WCHAR *colname; UINT type; UINT offset; INT ref_count; @@ -125,12 +125,12 @@ static int utf2mime(int x) return -1; } -LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) +WCHAR *encode_streamname(BOOL bTable, const WCHAR *in) { DWORD count = MAX_STREAM_NAME; DWORD ch, next; - LPWSTR out; - LPWSTR p; + WCHAR *out; + WCHAR *p; if( !bTable ) count = lstrlenW( in )+2; @@ -185,7 +185,7 @@ static int mime2utf(int x) return '_'; } -BOOL decode_streamname(LPCWSTR in, LPWSTR out) +BOOL decode_streamname(const WCHAR *in, WCHAR *out) { WCHAR ch; DWORD count = 0; @@ -240,7 +240,7 @@ void enum_stream_names( IStorage *stg ) IEnumSTATSTG_Release( stgenum ); } -UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, +UINT read_stream_data( IStorage *stg, const WCHAR *stname, BOOL table, BYTE **pdata, UINT *psz ) { HRESULT r; @@ -249,7 +249,7 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, ULONG sz, count; IStream *stm = NULL; STATSTG stat; - LPWSTR encname; + WCHAR *encname; encname = encode_streamname(table, stname); @@ -304,8 +304,8 @@ end: return ret; } -UINT write_stream_data( IStorage *stg, LPCWSTR stname, - LPCVOID data, UINT sz, BOOL bTable ) +UINT write_stream_data( IStorage *stg, const WCHAR *stname, + const void *data, UINT sz, BOOL bTable ) { HRESULT r; UINT ret = ERROR_FUNCTION_FAILED; @@ -313,7 +313,7 @@ UINT write_stream_data( IStorage *stg, LPCWSTR stname, IStream *stm = NULL; ULARGE_INTEGER size; LARGE_INTEGER pos; - LPWSTR encname; + WCHAR *encname; encname = encode_streamname(bTable, stname ); r = IStorage_OpenStream( stg, encname, NULL, @@ -491,7 +491,7 @@ void free_cached_tables( MSIDATABASE *db ) } } -static MSITABLE *find_cached_table( MSIDATABASE *db, LPCWSTR name ) +static MSITABLE *find_cached_table( MSIDATABASE *db, const WCHAR *name ) { MSITABLE *t; @@ -519,7 +519,7 @@ static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, } } -static UINT get_defaulttablecolumns( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO *colinfo, UINT *sz ) +static UINT get_defaulttablecolumns( MSIDATABASE *db, const WCHAR *name, MSICOLUMNINFO *colinfo, UINT *sz ) { const MSICOLUMNINFO *p; DWORD i, n; @@ -548,9 +548,9 @@ static UINT get_defaulttablecolumns( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINF return ERROR_SUCCESS; } -static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz ); +static UINT get_tablecolumns( MSIDATABASE *db, const WCHAR *szTableName, MSICOLUMNINFO *colinfo, UINT *sz ); -static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO **pcols, UINT *pcount ) +static UINT table_get_column_info( MSIDATABASE *db, const WCHAR *name, MSICOLUMNINFO **pcols, UINT *pcount ) { UINT r, column_count = 0; MSICOLUMNINFO *columns; @@ -583,7 +583,7 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO return r; } -static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) +static UINT get_table( MSIDATABASE *db, const WCHAR *name, MSITABLE **table_ret ) { MSITABLE *table; UINT r; @@ -639,7 +639,7 @@ static UINT read_table_int( BYTE *const *data, UINT row, UINT col, UINT bytes ) return ret; } -static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz ) +static UINT get_tablecolumns( MSIDATABASE *db, const WCHAR *szTableName, MSICOLUMNINFO *colinfo, UINT *sz ) { UINT r, i, n = 0, table_id, count, maxcount = *sz; MSITABLE *table = NULL; @@ -716,7 +716,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF return ERROR_SUCCESS; } -UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, +UINT msi_create_table( MSIDATABASE *db, const WCHAR *name, column_info *col_info, MSICONDITION persistent ) { enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent; @@ -944,7 +944,7 @@ err: return r; } -static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) +static void msi_update_table_columns( MSIDATABASE *db, const WCHAR *name ) { MSITABLE *table; UINT size, offset, old_count; @@ -971,7 +971,7 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) } /* try to find the table name in the _Tables table */ -BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) +BOOL TABLE_Exists( MSIDATABASE *db, const WCHAR *name ) { UINT r, table_id, i; MSITABLE *table; @@ -1053,13 +1053,13 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * return ERROR_SUCCESS; } -static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) +static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, WCHAR **pstname ) { - LPWSTR p; - LPWSTR stname = NULL; + WCHAR *p; + WCHAR *stname = NULL; UINT i, r, type, ival; DWORD len; - LPCWSTR sval; + const WCHAR *sval; MSIVIEW *view = (MSIVIEW *) tv; TRACE("%p %d\n", tv, row); @@ -1149,8 +1149,8 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT r; - LPWSTR encname; - LPWSTR full_name = NULL; + WCHAR *encname; + WCHAR *full_name = NULL; if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; @@ -1219,7 +1219,7 @@ static UINT TABLE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) return msi_view_get_row(tv->db, view, row, rec); } -static UINT msi_addstreamW( MSIDATABASE *db, LPCWSTR name, IStream *data ) +static UINT msi_addstreamW( MSIDATABASE *db, const WCHAR *name, IStream *data ) { static const WCHAR insert[] = { 'I','N','S','E','R','T',' ','I','N','T','O',' ', @@ -1274,7 +1274,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT } else if ( columninfo.type & MSITYPE_STRING ) { - LPCWSTR sval = MSI_RecordGetString( rec, iField ); + const WCHAR *sval = MSI_RecordGetString( rec, iField ); if (sval) { r = msi_string2idW(tv->db->strings, sval, pvalue); @@ -1332,7 +1332,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( MSITYPE_IS_BINARY(tv->columns[ i ].type) ) { IStream *stm; - LPWSTR stname; + WCHAR *stname; if ( r != ERROR_SUCCESS ) return ERROR_FUNCTION_FAILED; @@ -1361,7 +1361,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { - LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); + const WCHAR *sval = MSI_RecordGetString( rec, i + 1 ); val = msi_addstringW( tv->db->strings, sval, -1, 1, persistent ? StringPersistent : StringNonPersistent ); } @@ -1482,8 +1482,8 @@ static UINT TABLE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col } static UINT TABLE_get_column_info( struct tagMSIVIEW *view, - UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, - LPCWSTR *table_name ) + UINT n, const WCHAR **name, UINT *type, BOOL *temporary, + const WCHAR **table_name ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; @@ -1531,7 +1531,7 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column ) TRACE("skipping binary column\n"); else if ( tv->columns[i].type & MSITYPE_STRING ) { - LPCWSTR str; + const WCHAR *str; str = MSI_RecordGetString( rec, i+1 ); if (str == NULL || str[0] == 0) @@ -1947,7 +1947,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) return InterlockedIncrement(&tv->table->ref_count); } -static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number) +static UINT TABLE_remove_column(struct tagMSIVIEW *view, const WCHAR *table, UINT number) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSIRECORD *rec = NULL; @@ -2018,8 +2018,8 @@ static UINT TABLE_release(struct tagMSIVIEW *view) return ref; } -static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number, - LPCWSTR column, UINT type, BOOL hold) +static UINT TABLE_add_column(struct tagMSIVIEW *view, const WCHAR *table, UINT number, + const WCHAR *column, UINT type, BOOL hold) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSITABLE *msitable; @@ -2128,7 +2128,7 @@ static const MSIVIEWOPS table_ops = TABLE_drop, }; -UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) +UINT TABLE_CreateView( MSIDATABASE *db, const WCHAR *name, MSIVIEW **view ) { MSITABLEVIEW *tv ; UINT r, sz; @@ -2205,7 +2205,7 @@ UINT MSI_CommitTables( MSIDATABASE *db ) return r; } -MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) +MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, const WCHAR *table ) { MSITABLE *t; UINT r; @@ -2232,11 +2232,11 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) return ret; } -static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) +static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, WCHAR **pstname ) { - LPWSTR stname = NULL; - LPWSTR sval; - LPWSTR p; + WCHAR *stname = NULL; + WCHAR *sval; + WCHAR *p; DWORD len; UINT i, r; @@ -2319,7 +2319,7 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string if( MSITYPE_IS_BINARY(tv->columns[i].type) ) { - LPWSTR encname; + WCHAR *encname; IStream *stm = NULL; UINT r; @@ -2343,7 +2343,7 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string } else if( columns[i].type & MSITYPE_STRING ) { - LPCWSTR sval; + const WCHAR *sval; val = read_raw_int(rawdata, ofs, bytes_per_strref); sval = msi_string_lookup_id( st, val ); @@ -2385,7 +2385,7 @@ static void dump_record( MSIRECORD *rec ) n = MSI_RecordGetFieldCount( rec ); for( i=1; i<=n; i++ ) { - LPCWSTR sval; + const WCHAR *sval; if( MSI_RecordIsNull( rec, i ) ) TRACE("row -> []\n"); @@ -2398,7 +2398,7 @@ static void dump_record( MSIRECORD *rec ) static void dump_table( const string_table *st, const USHORT *rawdata, UINT rawsize ) { - LPCWSTR sval; + const WCHAR *sval; UINT i; for( i=0; i<(rawsize/2); i++ ) @@ -2410,7 +2410,7 @@ static void dump_table( const string_table *st, const USHORT *rawdata, UINT raws static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) { - LPCWSTR str; + const WCHAR *str; UINT i, r, *data; data = msi_alloc( tv->num_cols *sizeof (UINT) ); @@ -2507,7 +2507,7 @@ static UINT msi_table_find_row( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *row, UIN typedef struct { struct list entry; - LPWSTR name; + WCHAR *name; } TRANSFORMDATA; static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, diff --git a/libmsi/update.c b/libmsi/update.c index 56114ea..6c1526d 100644 --- a/libmsi/update.c +++ b/libmsi/update.c @@ -152,8 +152,8 @@ static UINT UPDATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co return wv->ops->get_dimensions( wv, rows, cols ); } -static UINT UPDATE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT UPDATE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; MSIVIEW *wv; @@ -223,7 +223,7 @@ static const MSIVIEWOPS update_ops = NULL, }; -UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, WCHAR *table, column_info *columns, struct expr *expr ) { MSIUPDATEVIEW *uv = NULL; diff --git a/libmsi/where.c b/libmsi/where.c index 332d81a..953e472 100644 --- a/libmsi/where.c +++ b/libmsi/where.c @@ -177,7 +177,7 @@ static UINT parse_column(MSIWHEREVIEW *wv, union ext_column *column, do { - LPCWSTR table_name; + const WCHAR *table_name; if (column->unparsed.table) { @@ -191,7 +191,7 @@ static UINT parse_column(MSIWHEREVIEW *wv, union ext_column *column, for(i = 1; i <= table->col_count; i++) { - LPCWSTR col_name; + const WCHAR *col_name; r = table->view->ops->get_column_info(table->view, i, &col_name, column_type, NULL, NULL); @@ -856,8 +856,8 @@ static UINT WHERE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col return ERROR_SUCCESS; } -static UINT WHERE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, - UINT *type, BOOL *temporary, LPCWSTR *table_name ) +static UINT WHERE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name, + UINT *type, BOOL *temporary, const WCHAR **table_name ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; JOINTABLE *table; @@ -877,7 +877,7 @@ static UINT WHERE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *nam static UINT join_find_row( MSIWHEREVIEW *wv, MSIRECORD *rec, UINT *row ) { - LPCWSTR str; + const WCHAR *str; UINT r, i, id, data; str = MSI_RecordGetString( rec, 1 ); @@ -1204,7 +1204,7 @@ static UINT WHERE_VerifyCondition( MSIWHEREVIEW *wv, struct expr *cond, return ERROR_SUCCESS; } -UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, +UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, WCHAR *tables, struct expr *cond ) { MSIWHEREVIEW *wv = NULL; diff --git a/tests/testdatabase.c b/tests/testdatabase.c index d87e4b5..69c3067 100644 --- a/tests/testdatabase.c +++ b/tests/testdatabase.c @@ -451,7 +451,7 @@ static void test_msiinsert(void) ok(r == TRUE, "file didn't exist after commit\n"); } -static UINT try_query_param( PMSIOBJECT hdb, LPCSTR szQuery, PMSIOBJECT hrec ) +static UINT try_query_param( PMSIOBJECT hdb, const CHAR *szQuery, PMSIOBJECT hrec ) { PMSIOBJECT htab = 0; UINT res; @@ -476,12 +476,12 @@ static UINT try_query_param( PMSIOBJECT hdb, LPCSTR szQuery, PMSIOBJECT hrec ) return res; } -static UINT try_query( PMSIOBJECT hdb, LPCSTR szQuery ) +static UINT try_query( PMSIOBJECT hdb, const CHAR *szQuery ) { return try_query_param( hdb, szQuery, 0 ); } -static UINT try_insert_query( PMSIOBJECT hdb, LPCSTR szQuery ) +static UINT try_insert_query( PMSIOBJECT hdb, const CHAR *szQuery ) { PMSIOBJECT hrec = 0; UINT r; @@ -1193,7 +1193,7 @@ static UINT get_columns_table_type(PMSIOBJECT hdb, const char *table, UINT field return type; } -static BOOL check_record( PMSIOBJECT rec, UINT field, LPCSTR val ) +static BOOL check_record( PMSIOBJECT rec, UINT field, const CHAR *val ) { CHAR buffer[0x20]; UINT r; @@ -1444,7 +1444,7 @@ static void test_longstrings(void) DeleteFile(msifile); } -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) +static void create_file_data(const CHAR *name, const CHAR *data, DWORD size) { HANDLE file; DWORD written; @@ -1710,7 +1710,7 @@ static void test_binary(void) char file[MAX_PATH]; char buf[MAX_PATH]; DWORD size; - LPCSTR query; + const CHAR *query; UINT r; /* insert a file into the Binary table */ @@ -1790,7 +1790,7 @@ static void test_binary(void) static void test_where_not_in_selected(void) { PMSIOBJECT hdb = 0, rec, view; - LPCSTR query; + const CHAR *query; UINT r; hdb = create_db(); @@ -1887,7 +1887,7 @@ static void test_where_not_in_selected(void) static void test_where(void) { PMSIOBJECT hdb = 0, rec, view; - LPCSTR query; + const CHAR *query; UINT r; DWORD size; CHAR buf[MAX_PATH]; @@ -2086,7 +2086,7 @@ static void write_file(const CHAR *filename, const char *data, int data_size) CloseHandle(hf); } -static UINT add_table_to_db(PMSIOBJECT hdb, LPCSTR table_data) +static UINT add_table_to_db(PMSIOBJECT hdb, const CHAR *table_data) { UINT r; @@ -2100,7 +2100,7 @@ static UINT add_table_to_db(PMSIOBJECT hdb, LPCSTR table_data) static void test_suminfo_import(void) { PMSIOBJECT hdb, hsi, view = 0; - LPCSTR query; + const CHAR *query; UINT r, count, size, type; char str_value[50]; INT int_value; @@ -2223,7 +2223,7 @@ static void test_suminfo_import(void) static void test_msiimport(void) { PMSIOBJECT hdb, view, rec; - LPCSTR query; + const CHAR *query; UINT r, count; signed int i; @@ -2446,7 +2446,7 @@ static void test_binary_import(void) char buf[MAX_PATH]; char path[MAX_PATH]; DWORD size; - LPCSTR query; + const CHAR *query; UINT r; /* create files to import */ @@ -2494,7 +2494,7 @@ static void test_binary_import(void) static void test_markers(void) { PMSIOBJECT hdb, rec; - LPCSTR query; + const CHAR *query; UINT r; hdb = create_db(); @@ -2782,7 +2782,7 @@ static const WCHAR data9[] = { /* Property */ }; static const struct { - LPCWSTR name; + const WCHAR *name; const void *data; DWORD size; } table_transform_data[] = @@ -2885,7 +2885,7 @@ static UINT set_summary_info(PMSIOBJECT hdb) return res; } -static PMSIOBJECT create_package_db(LPCSTR filename) +static PMSIOBJECT create_package_db(const CHAR *filename) { PMSIOBJECT hdb = 0; UINT res; @@ -2913,7 +2913,7 @@ static PMSIOBJECT create_package_db(LPCSTR filename) static void test_try_transform(void) { PMSIOBJECT hdb, hview, hrec, hpkg = 0; - LPCSTR query; + const CHAR *query; UINT r; DWORD sz; char buffer[MAX_PATH]; @@ -3196,7 +3196,7 @@ static const struct join_res_uint join_res_ninth[] = static void test_join(void) { PMSIOBJECT hdb, hview, hrec; - LPCSTR query; + const CHAR *query; CHAR buf[MAX_PATH]; UINT r, count; DWORD size, i; @@ -5080,7 +5080,7 @@ static void test_collation(void) static void test_select_markers(void) { PMSIOBJECT hdb = 0, rec, view, res; - LPCSTR query; + const CHAR *query; UINT r; DWORD size; CHAR buf[MAX_PATH]; @@ -5974,7 +5974,7 @@ static const WCHAR data14[] = { /* _StringPool */ }; static const struct { - LPCWSTR name; + const WCHAR *name; const void *data; DWORD size; } database_table_data[] = @@ -6073,7 +6073,7 @@ static void test_order(void) { PMSIOBJECT hdb, hview, hrec; CHAR buffer[MAX_PATH]; - LPCSTR query; + const CHAR *query; UINT r, sz; int val; @@ -7001,7 +7001,7 @@ static void test_noquotes(void) DeleteFileA(msifile); } -static void read_file_data(LPCSTR filename, LPSTR buffer) +static void read_file_data(const CHAR *filename, CHAR *buffer) { HANDLE file; DWORD read; @@ -7273,7 +7273,7 @@ static void test_where_viewmodify(void) MsiCloseHandle(hdb); } -static BOOL create_storage(LPCSTR name) +static BOOL create_storage(const CHAR *name) { WCHAR nameW[MAX_PATH]; IStorage *stg; @@ -7312,7 +7312,7 @@ static void test_storages_table(void) char file[MAX_PATH]; char buf[MAX_PATH]; WCHAR name[MAX_PATH]; - LPCSTR query; + const CHAR *query; HRESULT hr; DWORD size; UINT r; @@ -7431,7 +7431,7 @@ static void test_droptable(void) { PMSIOBJECT hdb, hview, hrec; CHAR buf[MAX_PATH]; - LPCSTR query; + const CHAR *query; DWORD size; UINT r; @@ -7650,7 +7650,7 @@ static void test_dbmerge(void) { PMSIOBJECT hdb, href, hview, hrec; CHAR buf[MAX_PATH]; - LPCSTR query; + const CHAR *query; DWORD size; UINT r; @@ -8276,7 +8276,7 @@ static void test_dbmerge(void) static void test_select_with_tablenames(void) { PMSIOBJECT hdb, view, rec; - LPCSTR query; + const CHAR *query; UINT r; int i; @@ -8361,7 +8361,7 @@ static const UINT ordervals[6][3] = static void test_insertorder(void) { PMSIOBJECT hdb, view, rec; - LPCSTR query; + const CHAR *query; UINT r; int i; @@ -8500,7 +8500,7 @@ static void test_columnorder(void) { PMSIOBJECT hdb, view, rec; char buf[MAX_PATH]; - LPCSTR query; + const CHAR *query; DWORD sz; UINT r; @@ -8994,7 +8994,7 @@ static void test_columnorder(void) static void test_createtable(void) { PMSIOBJECT hdb, htab = 0, hrec = 0; - LPCSTR query; + const CHAR *query; UINT res; DWORD size; char buffer[0x20]; diff --git a/tests/testrecord.c b/tests/testrecord.c index 1518e71..29d7dfe 100644 --- a/tests/testrecord.c +++ b/tests/testrecord.c @@ -477,7 +477,7 @@ static void test_fieldzero(void) { PMSIOBJECT hdb, hview, rec; CHAR buf[MAX_PATH]; - LPCSTR query; + const CHAR *query; DWORD sz; UINT r; diff --git a/tests/testsuminfo.c b/tests/testsuminfo.c index 0ba48f5..194f040 100644 --- a/tests/testsuminfo.c +++ b/tests/testsuminfo.c @@ -251,7 +251,7 @@ static const WCHAR tb[] = { 0x4840, 0x3f7f, 0x4164, 0x422f, 0x4836, 0 }; /* _Tab static const WCHAR sd[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3b6a, 0x45e4, 0x4824, 0 }; /* _StringData */ static const WCHAR sp[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0x482f, 0 }; /* _StringPool */ -#define LOSE_CONST(x) ((LPSTR)(UINT_PTR)(x)) +#define LOSE_CONST(x) ((char *)(UINT_PTR)(x)) static void test_create_database_binary(void) { |