From: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 38 +++---- dlls/msi/alter.c | 22 ++-- dlls/msi/appsearch.c | 38 +++---- dlls/msi/automation.c | 194 ++++++++++++++++++------------------ dlls/msi/create.c | 20 ++-- dlls/msi/custom.c | 10 +- dlls/msi/database.c | 52 +++++----- dlls/msi/delete.c | 22 ++-- dlls/msi/dialog.c | 227 ++++++++++++++++++++---------------------- dlls/msi/distinct.c | 40 ++++---- dlls/msi/drop.c | 14 +-- dlls/msi/files.c | 24 ++--- dlls/msi/font.c | 39 ++++---- dlls/msi/format.c | 94 ++++++++--------- dlls/msi/insert.c | 26 ++--- dlls/msi/msi.c | 12 +-- dlls/msi/msi_main.c | 17 ++-- dlls/msi/package.c | 6 +- dlls/msi/query.h | 3 +- dlls/msi/script.c | 39 ++++---- dlls/msi/select.c | 35 ++++--- dlls/msi/source.c | 23 ++--- dlls/msi/storages.c | 36 +++---- dlls/msi/streams.c | 32 +++--- dlls/msi/suminfo.c | 53 +++++----- dlls/msi/table.c | 186 +++++++++++++++++----------------- dlls/msi/tokenize.c | 12 +-- dlls/msi/update.c | 20 ++-- dlls/msi/where.c | 83 ++++++++------- 29 files changed, 709 insertions(+), 708 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fa15a5d24cf..b6f22308e3a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -69,8 +69,7 @@ static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR descripti return rc; } -static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, - INT rc) +static void ui_actioninfo(MSIPACKAGE *package, const WCHAR *action, BOOL start, INT rc) { MSIRECORD *row; WCHAR *template; @@ -815,11 +814,6 @@ UINT msi_load_all_components( MSIPACKAGE *package ) return r; } -typedef struct { - MSIPACKAGE *package; - MSIFEATURE *feature; -} _ilfs; - static UINT add_feature_component( MSIFEATURE *feature, MSICOMPONENT *comp ) { ComponentList *cl; @@ -846,22 +840,28 @@ static UINT add_feature_child( MSIFEATURE *parent, MSIFEATURE *child ) return ERROR_SUCCESS; } +struct package_feature +{ + MSIPACKAGE *package; + MSIFEATURE *feature; +}; + static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) { - _ilfs* ilfs = param; + struct package_feature *package_feature = param; LPCWSTR component; MSICOMPONENT *comp; component = MSI_RecordGetString(row,1); /* check to see if the component is already loaded */ - comp = msi_get_loaded_component( ilfs->package, component ); + comp = msi_get_loaded_component( package_feature->package, component ); if (!comp) { WARN("ignoring unknown component %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - add_feature_component( ilfs->feature, comp ); + add_feature_component( package_feature->feature, comp ); comp->Enabled = TRUE; return ERROR_SUCCESS; @@ -872,7 +872,7 @@ static UINT load_feature(MSIRECORD *row, LPVOID param) MSIPACKAGE *package = param; MSIFEATURE *feature; MSIQUERY *view; - _ilfs ilfs; + struct package_feature package_feature; UINT rc; /* fill in the data */ @@ -912,10 +912,10 @@ static UINT load_feature(MSIRECORD *row, LPVOID param) if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; - ilfs.package = package; - ilfs.feature = feature; + package_feature.package = package; + package_feature.feature = feature; - rc = MSI_IterateRecords(view, NULL, iterate_load_featurecomponents , &ilfs); + rc = MSI_IterateRecords(view, NULL, iterate_load_featurecomponents, &package_feature); msiobj_release(&view->hdr); return rc; } @@ -3418,19 +3418,19 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) return ERROR_SUCCESS; } -typedef struct { +struct typelib +{ CLSID clsid; LPWSTR source; - LPWSTR path; ITypeLib *ptLib; -} typelib_struct; +}; static BOOL CALLBACK Typelib_EnumResNameProc( HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) { TLIBATTR *attr; - typelib_struct *tl_struct = (typelib_struct*) lParam; + struct typelib *tl_struct = (struct typelib *)lParam; int sz; HRESULT res; @@ -3500,7 +3500,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) LPCWSTR component; MSICOMPONENT *comp; MSIFILE *file; - typelib_struct tl_struct; + struct typelib tl_struct; ITypeLib *tlib; HMODULE module; HRESULT hr; diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 00ba4fce590..0b2b3cf5bc9 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -34,18 +34,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -typedef struct tagMSIALTERVIEW +struct alter_view { MSIVIEW view; MSIDATABASE *db; MSIVIEW *table; column_info *colinfo; INT hold; -} MSIALTERVIEW; +}; static UINT ALTER_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p %d %d %p\n", av, row, col, val ); @@ -54,7 +54,7 @@ static UINT ALTER_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p %d %d %p\n", av, row, col, stm ); @@ -63,7 +63,7 @@ static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; UINT ref; TRACE("%p %p\n", av, record); @@ -86,7 +86,7 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) static UINT ALTER_close( struct tagMSIVIEW *view ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p\n", av ); @@ -95,7 +95,7 @@ static UINT ALTER_close( struct tagMSIVIEW *view ) static UINT ALTER_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p %p %p\n", av, rows, cols ); @@ -105,7 +105,7 @@ static UINT ALTER_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col static UINT ALTER_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p %d %p %p %p %p\n", av, n, name, type, temporary, table_name ); @@ -115,7 +115,7 @@ static UINT ALTER_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *nam static UINT ALTER_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p %d %p\n", av, eModifyMode, rec ); @@ -124,7 +124,7 @@ static UINT ALTER_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT ALTER_delete( struct tagMSIVIEW *view ) { - MSIALTERVIEW *av = (MSIALTERVIEW*)view; + struct alter_view *av = (struct alter_view *)view; TRACE("%p\n", av ); if (av->table) @@ -159,7 +159,7 @@ static const MSIVIEWOPS alter_ops = UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) { - MSIALTERVIEW *av; + struct alter_view *av; UINT r; TRACE("%p %p %s %d\n", view, colinfo, debugstr_w(name), hold ); diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 95c3312b3df..381e74317fe 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -typedef struct tagMSISIGNATURE +struct signature { LPCWSTR Name; /* NOT owned by this structure */ LPWSTR File; @@ -47,7 +47,7 @@ typedef struct tagMSISIGNATURE FILETIME MinTime; FILETIME MaxTime; LPWSTR Languages; -}MSISIGNATURE; +}; void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls) { @@ -80,7 +80,7 @@ void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls) * Returns ERROR_SUCCESS upon success (where not finding the record counts as * success), something else on error. */ -static UINT get_signature( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHAR *name ) +static UINT get_signature( MSIPACKAGE *package, struct signature *sig, const WCHAR *name ) { WCHAR *minVersion, *maxVersion, *p; MSIRECORD *row; @@ -148,13 +148,13 @@ static UINT get_signature( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHAR * } /* Frees any memory allocated in sig */ -static void free_signature( MSISIGNATURE *sig ) +static void free_signature( struct signature *sig ) { free(sig->File); free(sig->Languages); } -static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, MSISIGNATURE *sig ) +static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, struct signature *sig ) { VS_FIXEDFILEINFO *info; DWORD attr; @@ -220,7 +220,7 @@ done: return val; } -static UINT search_components( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig ) +static UINT search_components( MSIPACKAGE *package, WCHAR **appValue, struct signature *sig ) { MSIRECORD *row, *rec; LPCWSTR signature, guid; @@ -341,9 +341,9 @@ static void convert_reg_value( DWORD regType, const BYTE *value, DWORD sz, WCHAR } } -static UINT search_directory( MSIPACKAGE *, MSISIGNATURE *, const WCHAR *, int, WCHAR ** ); +static UINT search_directory( MSIPACKAGE *, struct signature *, const WCHAR *, int, WCHAR ** ); -static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig ) +static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, struct signature *sig ) { const WCHAR *keyPath, *valueName; WCHAR *deformatted = NULL, *ptr = NULL, *end; @@ -494,7 +494,7 @@ static LPWSTR get_ini_field(LPWSTR buf, int field) return wcsdup(beg); } -static UINT search_ini( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig ) +static UINT search_ini( MSIPACKAGE *package, WCHAR **appValue, struct signature *sig ) { MSIRECORD *row; LPWSTR fileName, section, key; @@ -652,7 +652,7 @@ done: * Return ERROR_SUCCESS in case of success (whether or not the file matches), * something else if an install-halting error occurs. */ -static UINT file_version_matches( MSIPACKAGE *package, const MSISIGNATURE *sig, const WCHAR *filePath, +static UINT file_version_matches( MSIPACKAGE *package, const struct signature *sig, const WCHAR *filePath, BOOL *matches ) { UINT len; @@ -712,7 +712,7 @@ static UINT file_version_matches( MSIPACKAGE *package, const MSISIGNATURE *sig, * Return ERROR_SUCCESS in case of success (whether or not the file matches), * something else if an install-halting error occurs. */ -static UINT file_matches_sig( MSIPACKAGE *package, const MSISIGNATURE *sig, const WIN32_FIND_DATAW *findData, +static UINT file_matches_sig( MSIPACKAGE *package, const struct signature *sig, const WIN32_FIND_DATAW *findData, const WCHAR *fullFilePath, BOOL *matches ) { UINT rc = ERROR_SUCCESS; @@ -757,7 +757,7 @@ static UINT file_matches_sig( MSIPACKAGE *package, const MSISIGNATURE *sig, cons * Returns ERROR_SUCCESS on success (which may include non-critical errors), * something else on failures which should halt the install. */ -static UINT recurse_search_directory( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig, const WCHAR *dir, +static UINT recurse_search_directory( MSIPACKAGE *package, WCHAR **appValue, struct signature *sig, const WCHAR *dir, int depth ) { HANDLE hFind; @@ -871,7 +871,7 @@ static BOOL is_full_path( const WCHAR *path ) return ret; } -static UINT search_directory( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHAR *path, int depth, WCHAR **appValue ) +static UINT search_directory( MSIPACKAGE *package, struct signature *sig, const WCHAR *path, int depth, WCHAR **appValue ) { UINT rc; DWORD attr; @@ -940,9 +940,9 @@ static UINT search_directory( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHA return rc; } -static UINT search_sig_name( MSIPACKAGE *, const WCHAR *, MSISIGNATURE *, WCHAR ** ); +static UINT search_sig_name( MSIPACKAGE *, const WCHAR *, struct signature *, WCHAR ** ); -static UINT search_dr( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig ) +static UINT search_dr( MSIPACKAGE *package, WCHAR **appValue, struct signature *sig ) { LPWSTR parent = NULL; LPCWSTR parentName; @@ -968,7 +968,7 @@ static UINT search_dr( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig parentName = MSI_RecordGetString(row, 2); if (parentName) { - MSISIGNATURE parentSig; + struct signature parentSig; search_sig_name( package, parentName, &parentSig, &parent ); free_signature( &parentSig ); @@ -1017,7 +1017,7 @@ static UINT search_dr( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig return rc; } -static UINT search_sig_name( MSIPACKAGE *package, const WCHAR *sigName, MSISIGNATURE *sig, WCHAR **appValue ) +static UINT search_sig_name( MSIPACKAGE *package, const WCHAR *sigName, struct signature *sig, WCHAR **appValue ) { UINT rc; @@ -1045,7 +1045,7 @@ static UINT ITERATE_AppSearch(MSIRECORD *row, LPVOID param) MSIPACKAGE *package = param; LPCWSTR propName, sigName; LPWSTR value = NULL; - MSISIGNATURE sig; + struct signature sig; MSIRECORD *uirow; UINT r; @@ -1102,7 +1102,7 @@ static UINT ITERATE_CCPSearch(MSIRECORD *row, LPVOID param) MSIPACKAGE *package = param; LPCWSTR signature; LPWSTR value = NULL; - MSISIGNATURE sig; + struct signature sig; UINT r = ERROR_SUCCESS; signature = MSI_RecordGetString(row, 1); diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 99852938b0e..36891cc62da 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -41,33 +41,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); #define REG_INDEX_CLASSES_ROOT 0 #define REG_INDEX_DYN_DATA 6 -typedef struct AutomationObject AutomationObject; +struct automation_object; -/* function that is called from AutomationObject::Invoke, specific to this type of object */ -typedef HRESULT (*auto_invoke_func)(AutomationObject* This, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD flags, DISPPARAMS* pDispParams, - VARIANT* result, EXCEPINFO* ei, UINT* arg_err); -/* function that is called from AutomationObject::Release when the object is being freed - to free any private data structures (or NULL) */ -typedef void (*auto_free_func)(AutomationObject* This); - -typedef struct { +struct tid_id +{ REFIID riid; - auto_invoke_func fn_invoke; - auto_free_func fn_free; -} tid_id_t; - + /* function that is called from AutomationObject::Invoke, specific to this type of object */ + HRESULT (*fn_invoke)(struct automation_object *, DISPID, REFIID, LCID, WORD, DISPPARAMS *, VARIANT *, + EXCEPINFO *, UINT *); + /* function that is called from AutomationObject::Release when the object is being freed + to free any private data structures (or NULL) */ + void (*fn_free)(struct automation_object *); +}; -static HRESULT database_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static HRESULT installer_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static HRESULT record_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static HRESULT session_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static HRESULT list_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static void list_free(AutomationObject*); -static HRESULT summaryinfo_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static HRESULT view_invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static HRESULT database_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static HRESULT installer_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static HRESULT record_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static HRESULT session_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static HRESULT list_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static void list_free(struct automation_object*); +static HRESULT summaryinfo_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); +static HRESULT view_invoke(struct automation_object*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static tid_id_t tid_ids[] = { +static struct tid_id tid_ids[] = +{ { &DIID_Database, database_invoke }, { &DIID_Installer, installer_invoke }, { &DIID_Record, record_invoke }, @@ -137,10 +134,11 @@ void release_typelib(void) } /* - * AutomationObject - "base" class for all automation objects. For each interface, we implement Invoke function - * called from AutomationObject::Invoke. + * struct automation_object - "base" class for all automation objects. For each interface, we implement Invoke + * function called from AutomationObject::Invoke. */ -struct AutomationObject { +struct automation_object +{ IDispatch IDispatch_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; LONG ref; @@ -152,46 +150,49 @@ struct AutomationObject { MSIHANDLE msiHandle; }; -typedef struct { - AutomationObject autoobj; +struct list_object +{ + struct automation_object autoobj; int count; VARIANT *data; -} ListObject; +}; static HRESULT create_database(MSIHANDLE, IDispatch**); -static HRESULT create_list_enumerator(ListObject*, void**); +static HRESULT create_list_enumerator(struct list_object *, void **); static HRESULT create_summaryinfo(MSIHANDLE, IDispatch**); static HRESULT create_view(MSIHANDLE, IDispatch**); -/* ListEnumerator - IEnumVARIANT implementation for MSI automation lists */ -typedef struct { +/* struct list_enumerator - IEnumVARIANT implementation for MSI automation lists */ +struct list_enumerator +{ IEnumVARIANT IEnumVARIANT_iface; LONG ref; - /* Current position and pointer to AutomationObject that stores actual data */ + /* Current position and pointer to struct automation_object that stores actual data */ ULONG pos; - ListObject *list; -} ListEnumerator; + struct list_object *list; +}; -typedef struct { - AutomationObject autoobj; +struct session_object +{ + struct automation_object autoobj; IDispatch *installer; -} SessionObject; +}; -static inline AutomationObject *impl_from_IProvideMultipleClassInfo( IProvideMultipleClassInfo *iface ) +static inline struct automation_object *impl_from_IProvideMultipleClassInfo( IProvideMultipleClassInfo *iface ) { - return CONTAINING_RECORD(iface, AutomationObject, IProvideMultipleClassInfo_iface); + return CONTAINING_RECORD(iface, struct automation_object, IProvideMultipleClassInfo_iface); } -static inline AutomationObject *impl_from_IDispatch( IDispatch *iface ) +static inline struct automation_object *impl_from_IDispatch( IDispatch *iface ) { - return CONTAINING_RECORD(iface, AutomationObject, IDispatch_iface); + return CONTAINING_RECORD(iface, struct automation_object, IDispatch_iface); } /* AutomationObject methods */ static HRESULT WINAPI AutomationObject_QueryInterface(IDispatch* iface, REFIID riid, void** ppvObject) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); @@ -221,7 +222,7 @@ static HRESULT WINAPI AutomationObject_QueryInterface(IDispatch* iface, REFIID r static ULONG WINAPI AutomationObject_AddRef(IDispatch* iface) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); TRACE("(%p/%p)\n", iface, This); @@ -230,7 +231,7 @@ static ULONG WINAPI AutomationObject_AddRef(IDispatch* iface) static ULONG WINAPI AutomationObject_Release(IDispatch* iface) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)\n", iface, This); @@ -249,7 +250,7 @@ static HRESULT WINAPI AutomationObject_GetTypeInfoCount( IDispatch* iface, UINT* pctinfo) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); TRACE("(%p/%p)->(%p)\n", iface, This, pctinfo); *pctinfo = 1; @@ -262,7 +263,7 @@ static HRESULT WINAPI AutomationObject_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); HRESULT hr; TRACE( "(%p/%p)->(%u, %ld, %p)\n", iface, This, iTInfo, lcid, ppTInfo ); @@ -283,7 +284,7 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames( LCID lcid, DISPID* rgDispId) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); ITypeInfo *ti; HRESULT hr; @@ -324,7 +325,7 @@ static HRESULT WINAPI AutomationObject_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - AutomationObject *This = impl_from_IDispatch(iface); + struct automation_object *This = impl_from_IDispatch(iface); HRESULT hr; unsigned int uArgErr; VARIANT varResultDummy; @@ -437,25 +438,25 @@ static HRESULT WINAPI ProvideMultipleClassInfo_QueryInterface( REFIID riid, VOID** ppvoid) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); return IDispatch_QueryInterface(&This->IDispatch_iface, riid, ppvoid); } static ULONG WINAPI ProvideMultipleClassInfo_AddRef(IProvideMultipleClassInfo* iface) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); return IDispatch_AddRef(&This->IDispatch_iface); } static ULONG WINAPI ProvideMultipleClassInfo_Release(IProvideMultipleClassInfo* iface) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); return IDispatch_Release(&This->IDispatch_iface); } static HRESULT WINAPI ProvideMultipleClassInfo_GetClassInfo(IProvideMultipleClassInfo* iface, ITypeInfo** ppTI) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); HRESULT hr; TRACE("(%p/%p)->(%p)\n", iface, This, ppTI); @@ -469,7 +470,7 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetClassInfo(IProvideMultipleClas static HRESULT WINAPI ProvideMultipleClassInfo_GetGUID(IProvideMultipleClassInfo* iface, DWORD dwGuidKind, GUID* pGUID) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); TRACE("(%p/%p)->(%lu, %s)\n", iface, This, dwGuidKind, debugstr_guid(pGUID)); if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) @@ -482,7 +483,7 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetGUID(IProvideMultipleClassInfo static HRESULT WINAPI ProvideMultipleClassInfo_GetMultiTypeInfoCount(IProvideMultipleClassInfo* iface, ULONG* pcti) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); TRACE("(%p/%p)->(%p)\n", iface, This, pcti); *pcti = 1; @@ -498,7 +499,7 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetInfoOfIndex(IProvideMultipleCl IID* piidPrimary, IID* piidSource) { - AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); + struct automation_object *This = impl_from_IProvideMultipleClassInfo(iface); TRACE("(%p/%p)->(%lu, %#lx, %p, %p, %p, %p, %p)\n", iface, This, iti, dwFlags, ti, pdwTIFlags, pcdispidReserved, piidPrimary, piidSource); @@ -541,7 +542,7 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = ProvideMultipleClassInfo_GetInfoOfIndex }; -static void init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid) +static void init_automation_object(struct automation_object *This, MSIHANDLE msiHandle, tid_t tid) { TRACE("%p, %lu, %s\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid))); @@ -556,15 +557,15 @@ static void init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, * ListEnumerator methods */ -static inline ListEnumerator *impl_from_IEnumVARIANT(IEnumVARIANT* iface) +static inline struct list_enumerator *impl_from_IEnumVARIANT(IEnumVARIANT* iface) { - return CONTAINING_RECORD(iface, ListEnumerator, IEnumVARIANT_iface); + return CONTAINING_RECORD(iface, struct list_enumerator, IEnumVARIANT_iface); } static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, void** ppvObject) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); @@ -590,7 +591,7 @@ static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p/%p)\n", iface, This); @@ -599,7 +600,7 @@ static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)\n", iface, This); @@ -616,7 +617,7 @@ static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT* rgVar, ULONG* fetched) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); ULONG i, local; TRACE("%p, %lu, %p, %p\n", iface, celt, rgVar, fetched); @@ -640,7 +641,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); TRACE("%p, %lu\n", iface, celt); @@ -656,7 +657,7 @@ static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p)\n", iface); @@ -666,7 +667,7 @@ static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **ppEnum) { - ListEnumerator *This = impl_from_IEnumVARIANT(iface); + struct list_enumerator *This = impl_from_IEnumVARIANT(iface); HRESULT hr; TRACE("(%p,%p)\n", iface, ppEnum); @@ -697,13 +698,13 @@ static const struct IEnumVARIANTVtbl ListEnumerator_Vtbl = }; /* Create a list enumerator, placing the result in the pointer ppObj. */ -static HRESULT create_list_enumerator(ListObject *list, void **ppObj) +static HRESULT create_list_enumerator(struct list_object *list, void **ppObj) { - ListEnumerator *object; + struct list_enumerator *object; TRACE("(%p, %p)\n", list, ppObj); - object = malloc(sizeof(ListEnumerator)); + object = malloc(sizeof(*object)); /* Set all the VTable references */ object->IEnumVARIANT_iface.lpVtbl = &ListEnumerator_Vtbl; @@ -752,7 +753,7 @@ static HRESULT DispGetParam_CopyOnly( } static HRESULT summaryinfo_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -904,7 +905,7 @@ static HRESULT summaryinfo_invoke( } static HRESULT record_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -996,7 +997,7 @@ static HRESULT record_invoke( static HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) { - AutomationObject *record; + struct automation_object *record; record = malloc(sizeof(*record)); if (!record) return E_OUTOFMEMORY; @@ -1009,7 +1010,7 @@ static HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) } static HRESULT list_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1019,7 +1020,7 @@ static HRESULT list_invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); + struct list_object *list = CONTAINING_RECORD(This, struct list_object, autoobj); IUnknown *pUnk = NULL; HRESULT hr; @@ -1065,9 +1066,9 @@ static HRESULT list_invoke( return S_OK; } -static void list_free(AutomationObject *This) +static void list_free(struct automation_object *This) { - ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); + struct list_object *list = CONTAINING_RECORD(This, struct list_object, autoobj); int i; for (i = 0; i < list->count; i++) @@ -1105,11 +1106,11 @@ static HRESULT get_products_count(const WCHAR *product, int *len) static HRESULT create_list(const WCHAR *product, IDispatch **dispatch) { - ListObject *list; + struct list_object *list; HRESULT hr; int i; - list = calloc(1, sizeof(ListObject)); + list = calloc(1, sizeof(*list)); if (!list) return E_OUTOFMEMORY; init_automation_object(&list->autoobj, 0, StringList_tid); @@ -1151,7 +1152,7 @@ static HRESULT create_list(const WCHAR *product, IDispatch **dispatch) } static HRESULT view_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1176,7 +1177,7 @@ static HRESULT view_invoke( { hr = DispGetParam(pDispParams, 0, VT_DISPATCH, &varg0, puArgErr); if (SUCCEEDED(hr) && V_DISPATCH(&varg0) != NULL) - MsiViewExecute(This->msiHandle, ((AutomationObject *)V_DISPATCH(&varg0))->msiHandle); + MsiViewExecute(This->msiHandle, ((struct automation_object *)V_DISPATCH(&varg0))->msiHandle); else MsiViewExecute(This->msiHandle, 0); } @@ -1211,7 +1212,8 @@ static HRESULT view_invoke( hr = DispGetParam(pDispParams, 1, VT_DISPATCH, &varg1, puArgErr); if (FAILED(hr)) return hr; if (!V_DISPATCH(&varg1)) return DISP_E_EXCEPTION; - if ((ret = MsiViewModify(This->msiHandle, V_I4(&varg0), ((AutomationObject *)V_DISPATCH(&varg1))->msiHandle)) != ERROR_SUCCESS) + if ((ret = MsiViewModify(This->msiHandle, V_I4(&varg0), + ((struct automation_object *)V_DISPATCH(&varg1))->msiHandle)) != ERROR_SUCCESS) { VariantClear(&varg1); ERR("MsiViewModify returned %d\n", ret); @@ -1255,7 +1257,7 @@ static HRESULT DatabaseImpl_LastErrorRecord(WORD wFlags, } HRESULT database_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1340,7 +1342,7 @@ HRESULT database_invoke( } static HRESULT session_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1350,7 +1352,7 @@ static HRESULT session_invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - SessionObject *session = CONTAINING_RECORD(This, SessionObject, autoobj); + struct session_object *session = CONTAINING_RECORD(This, struct session_object, autoobj); WCHAR *szString; DWORD dwLen = 0; MSIHANDLE msiHandle; @@ -1521,7 +1523,7 @@ static HRESULT session_invoke( V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = - MsiProcessMessage(This->msiHandle, V_I4(&varg0), ((AutomationObject *)V_DISPATCH(&varg1))->msiHandle); + MsiProcessMessage(This->msiHandle, V_I4(&varg0), ((struct automation_object *)V_DISPATCH(&varg1))->msiHandle); break; case DISPID_SESSION_SETINSTALLLEVEL: @@ -1682,7 +1684,7 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, return create_record(hrec, &V_DISPATCH(pVarResult)); } -static HRESULT InstallerImpl_OpenPackage(AutomationObject* This, +static HRESULT InstallerImpl_OpenPackage(struct automation_object *This, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, @@ -2319,7 +2321,7 @@ static HRESULT InstallerImpl_RelatedProducts(WORD flags, } static HRESULT installer_invoke( - AutomationObject* This, + struct automation_object *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2420,14 +2422,14 @@ static HRESULT installer_invoke( HRESULT create_msiserver(IUnknown *outer, void **ppObj) { - AutomationObject *installer; + struct automation_object *installer; TRACE("(%p %p)\n", outer, ppObj); if (outer) return CLASS_E_NOAGGREGATION; - installer = malloc(sizeof(AutomationObject)); + installer = malloc(sizeof(*installer)); if (!installer) return E_OUTOFMEMORY; init_automation_object(installer, 0, Installer_tid); @@ -2439,9 +2441,9 @@ HRESULT create_msiserver(IUnknown *outer, void **ppObj) HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **disp) { - SessionObject *session; + struct session_object *session; - session = malloc(sizeof(SessionObject)); + session = malloc(sizeof(*session)); if (!session) return E_OUTOFMEMORY; init_automation_object(&session->autoobj, msiHandle, Session_tid); @@ -2454,11 +2456,11 @@ HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **di static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) { - AutomationObject *database; + struct automation_object *database; TRACE("%lu %p\n", msiHandle, dispatch); - database = malloc(sizeof(AutomationObject)); + database = malloc(sizeof(*database)); if (!database) return E_OUTOFMEMORY; init_automation_object(database, msiHandle, Database_tid); @@ -2470,11 +2472,11 @@ static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch) { - AutomationObject *view; + struct automation_object *view; TRACE("%lu %p\n", msiHandle, dispatch); - view = malloc(sizeof(AutomationObject)); + view = malloc(sizeof(*view)); if (!view) return E_OUTOFMEMORY; init_automation_object(view, msiHandle, View_tid); @@ -2486,7 +2488,7 @@ static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch) static HRESULT create_summaryinfo(MSIHANDLE msiHandle, IDispatch **disp) { - AutomationObject *info; + struct automation_object *info; info = malloc(sizeof(*info)); if (!info) return E_OUTOFMEMORY; diff --git a/dlls/msi/create.c b/dlls/msi/create.c index c9aa8f18f23..0202a67ca18 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ -typedef struct tagMSICREATEVIEW +struct create_view { MSIVIEW view; MSIDATABASE *db; @@ -46,11 +46,11 @@ typedef struct tagMSICREATEVIEW BOOL bIsTemp; BOOL hold; column_info *col_info; -} MSICREATEVIEW; +}; static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; TRACE("%p %d %d %p\n", cv, row, col, val ); @@ -59,7 +59,7 @@ static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; BOOL persist = (cv->bIsTemp) ? MSICONDITION_FALSE : MSICONDITION_TRUE; TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), @@ -73,7 +73,7 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) static UINT CREATE_close( struct tagMSIVIEW *view ) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; TRACE("%p\n", cv); @@ -82,7 +82,7 @@ static UINT CREATE_close( struct tagMSIVIEW *view ) static UINT CREATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; TRACE("%p %p %p\n", cv, rows, cols ); @@ -92,7 +92,7 @@ static UINT CREATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co static UINT CREATE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; TRACE("%p %d %p %p %p %p\n", cv, n, name, type, temporary, table_name ); @@ -102,7 +102,7 @@ static UINT CREATE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na static UINT CREATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; TRACE("%p %d %p\n", cv, eModifyMode, rec ); @@ -111,7 +111,7 @@ static UINT CREATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT CREATE_delete( struct tagMSIVIEW *view ) { - MSICREATEVIEW *cv = (MSICREATEVIEW*)view; + struct create_view *cv = (struct create_view *)view; TRACE("%p\n", cv ); @@ -160,7 +160,7 @@ static UINT check_columns( const column_info *col_info ) UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *col_info, BOOL hold ) { - MSICREATEVIEW *cv = NULL; + struct create_view *cv = NULL; UINT r; column_info *col; BOOL temp = TRUE; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fa5c1051fee..8b020db260d 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -43,13 +43,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); #define CUSTOM_ACTION_TYPE_MASK 0x3F -typedef struct tagMSIRUNNINGACTION +struct running_action { struct list entry; HANDLE handle; BOOL process; LPWSTR name; -} MSIRUNNINGACTION; +}; typedef UINT (WINAPI *MsiCustomActionEntryPoint)( MSIHANDLE ); @@ -298,9 +298,9 @@ static MSIBINARY *get_temp_binary(MSIPACKAGE *package, LPCWSTR source) static void file_running_action(MSIPACKAGE* package, HANDLE Handle, BOOL process, LPCWSTR name) { - MSIRUNNINGACTION *action; + struct running_action *action; - action = malloc( sizeof(MSIRUNNINGACTION) ); + action = malloc( sizeof(*action) ); action->handle = Handle; action->process = process; @@ -1563,7 +1563,7 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) while ((item = list_head( &package->RunningActions ))) { - MSIRUNNINGACTION *action = LIST_ENTRY( item, MSIRUNNINGACTION, entry ); + struct running_action *action = LIST_ENTRY( item, struct running_action, entry ); list_remove( &action->entry ); diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 504e81f57c7..20c74c4d742 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1206,7 +1206,7 @@ UINT WINAPI MsiDatabaseMergeA( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, co return r; } -typedef struct _tagMERGETABLE +struct merge_table { struct list entry; struct list rows; @@ -1218,22 +1218,22 @@ typedef struct _tagMERGETABLE DWORD numtypes; LPWSTR *labels; DWORD numlabels; -} MERGETABLE; +}; -typedef struct _tagMERGEROW +struct merge_row { struct list entry; MSIRECORD *data; -} MERGEROW; +}; -typedef struct _tagMERGEDATA +struct merge_data { MSIDATABASE *db; MSIDATABASE *merge; - MERGETABLE *curtable; + struct merge_table *curtable; MSIQUERY *curview; struct list *tabledata; -} MERGEDATA; +}; static BOOL merge_type_match(LPCWSTR type1, LPCWSTR type2) { @@ -1462,9 +1462,9 @@ done: static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) { - MERGEDATA *data = param; - MERGETABLE *table = data->curtable; - MERGEROW *mergerow; + struct merge_data *data = param; + struct merge_table *table = data->curtable; + struct merge_row *mergerow; MSIQUERY *dbview = NULL; MSIRECORD *row = NULL; LPWSTR query = NULL; @@ -1496,7 +1496,7 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) r = ERROR_SUCCESS; } - mergerow = malloc(sizeof(MERGEROW)); + mergerow = malloc(sizeof(*mergerow)); if (!mergerow) { r = ERROR_OUTOFMEMORY; @@ -1606,13 +1606,13 @@ end: return r; } -static void merge_free_rows(MERGETABLE *table) +static void merge_free_rows(struct merge_table *table) { struct list *item, *cursor; LIST_FOR_EACH_SAFE(item, cursor, &table->rows) { - MERGEROW *row = LIST_ENTRY(item, MERGEROW, entry); + struct merge_row *row = LIST_ENTRY(item, struct merge_row, entry); list_remove(&row->entry); msiobj_release(&row->data->hdr); @@ -1620,7 +1620,7 @@ static void merge_free_rows(MERGETABLE *table) } } -static void free_merge_table(MERGETABLE *table) +static void free_merge_table(struct merge_table *table) { UINT i; @@ -1654,13 +1654,13 @@ static void free_merge_table(MERGETABLE *table) free(table); } -static UINT get_merge_table(MSIDATABASE *db, const WCHAR *name, MERGETABLE **ptable) +static UINT get_merge_table(MSIDATABASE *db, const WCHAR *name, struct merge_table **ptable) { UINT r; - MERGETABLE *table; + struct merge_table *table; MSIQUERY *mergeview = NULL; - table = calloc(1, sizeof(MERGETABLE)); + table = calloc(1, sizeof(*table)); if (!table) { *ptable = NULL; @@ -1701,8 +1701,8 @@ err: static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param) { - MERGEDATA *data = param; - MERGETABLE *table; + struct merge_data *data = param; + struct merge_table *table; MSIQUERY *dbview = NULL; MSIQUERY *mergeview = NULL; LPCWSTR name; @@ -1754,7 +1754,7 @@ static UINT gather_merge_data(MSIDATABASE *db, MSIDATABASE *merge, struct list *tabledata) { MSIQUERY *view; - MERGEDATA data; + struct merge_data data; UINT r; r = MSI_DatabaseOpenViewW(merge, L"SELECT * FROM `_Tables`", &view); @@ -1769,10 +1769,10 @@ static UINT gather_merge_data(MSIDATABASE *db, MSIDATABASE *merge, return r; } -static UINT merge_table(MSIDATABASE *db, MERGETABLE *table) +static UINT merge_table(MSIDATABASE *db, struct merge_table *table) { UINT r; - MERGEROW *row; + struct merge_row *row; MSIVIEW *tv; if (!TABLE_Exists(db, table->name)) @@ -1782,7 +1782,7 @@ static UINT merge_table(MSIDATABASE *db, MERGETABLE *table) return ERROR_FUNCTION_FAILED; } - LIST_FOR_EACH_ENTRY(row, &table->rows, MERGEROW, entry) + LIST_FOR_EACH_ENTRY(row, &table->rows, struct merge_row, entry) { r = TABLE_CreateView(db, table->name, &tv); if (r != ERROR_SUCCESS) @@ -1832,7 +1832,7 @@ UINT WINAPI MsiDatabaseMergeW( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, co struct list tabledata = LIST_INIT(tabledata); struct list *item, *cursor; MSIDATABASE *db, *merge; - MERGETABLE *table; + struct merge_table *table; BOOL conflicts; UINT r; @@ -1854,7 +1854,7 @@ UINT WINAPI MsiDatabaseMergeW( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, co goto done; conflicts = FALSE; - LIST_FOR_EACH_ENTRY(table, &tabledata, MERGETABLE, entry) + LIST_FOR_EACH_ENTRY(table, &tabledata, struct merge_table, entry) { if (table->numconflicts) { @@ -1875,7 +1875,7 @@ UINT WINAPI MsiDatabaseMergeW( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, co LIST_FOR_EACH_SAFE(item, cursor, &tabledata) { - MERGETABLE *table = LIST_ENTRY(item, MERGETABLE, entry); + struct merge_table *table = LIST_ENTRY(item, struct merge_table, entry); list_remove(&table->entry); free_merge_table(table); } diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index e0dafdd7068..1d80dce8d87 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -48,16 +48,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); * that's a bug in the way I'm running the query, or a just a bug. */ -typedef struct tagMSIDELETEVIEW +struct delete_view { MSIVIEW view; MSIDATABASE *db; MSIVIEW *table; -} MSIDELETEVIEW; +}; static UINT DELETE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p %d %d %p\n", dv, row, col, val ); @@ -66,7 +66,7 @@ static UINT DELETE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT DELETE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p %d %d %p\n", dv, row, col, stm ); @@ -75,7 +75,7 @@ static UINT DELETE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IS static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; UINT r, i, rows = 0, cols = 0; TRACE("%p %p\n", dv, record); @@ -102,7 +102,7 @@ static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) static UINT DELETE_close( struct tagMSIVIEW *view ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p\n", dv ); @@ -114,7 +114,7 @@ static UINT DELETE_close( struct tagMSIVIEW *view ) static UINT DELETE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p %p %p\n", dv, rows, cols ); @@ -129,7 +129,7 @@ static UINT DELETE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co static UINT DELETE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p %d %p %p %p %p\n", dv, n, name, type, temporary, table_name ); @@ -143,7 +143,7 @@ static UINT DELETE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na static UINT DELETE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p %d %p\n", dv, eModifyMode, rec ); @@ -152,7 +152,7 @@ static UINT DELETE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT DELETE_delete( struct tagMSIVIEW *view ) { - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; + struct delete_view *dv = (struct delete_view *)view; TRACE("%p\n", dv ); @@ -189,7 +189,7 @@ static const MSIVIEWOPS delete_ops = UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) { - MSIDELETEVIEW *dv = NULL; + struct delete_view *dv = NULL; TRACE("%p\n", dv ); diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d7c9b088c24..91e7a567f55 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -49,19 +49,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); extern HINSTANCE msi_hInstance; -struct msi_control_tag; -typedef struct msi_control_tag msi_control; -typedef UINT (*msi_handler)( msi_dialog *, msi_control *, WPARAM ); -typedef void (*msi_update)( msi_dialog *, msi_control * ); -typedef UINT (*control_event_handler)( msi_dialog *, const WCHAR *, const WCHAR * ); -typedef UINT (*event_handler)( msi_dialog *, const WCHAR * ); - -struct msi_control_tag +struct control { struct list entry; HWND hwnd; - msi_handler handler; - msi_update update; + UINT (*handler)( msi_dialog *, struct control *, WPARAM ); + void (*update)( msi_dialog *, struct control * ); LPWSTR property; LPWSTR value; HBITMAP hBitmap; @@ -77,19 +70,19 @@ struct msi_control_tag WCHAR name[1]; }; -typedef struct msi_font_tag +struct font { struct list entry; HFONT hfont; COLORREF color; WCHAR name[1]; -} msi_font; +}; struct msi_dialog_tag { MSIPACKAGE *package; msi_dialog *parent; - control_event_handler event_handler; + UINT (*event_handler)( msi_dialog *, const WCHAR *, const WCHAR * ); BOOL finished; INT scale; DWORD attributes; @@ -101,7 +94,7 @@ struct msi_dialog_tag HWND hWndFocus; LPWSTR control_default; LPWSTR control_cancel; - event_handler pending_event; + UINT (*pending_event)( msi_dialog *, const WCHAR * ); LPWSTR pending_argument; INT retval; WCHAR name[1]; @@ -116,19 +109,18 @@ struct subscriber WCHAR *attribute; }; -typedef UINT (*msi_dialog_control_func)( msi_dialog *dialog, MSIRECORD *rec ); struct control_handler { LPCWSTR control_type; - msi_dialog_control_func func; + UINT (*func)( msi_dialog *dialog, MSIRECORD *rec ); }; -typedef struct +struct radio_button_group_descr { - msi_dialog* dialog; - msi_control *parent; - LPWSTR propval; -} radio_button_group_descr; + msi_dialog *dialog; + struct control *parent; + WCHAR *propval; +}; /* dialog sequencing */ @@ -167,41 +159,41 @@ static INT dialog_scale_unit( msi_dialog *dialog, INT val ) return MulDiv( val, dialog->scale, 12 ); } -static msi_control *dialog_find_control( msi_dialog *dialog, LPCWSTR name ) +static struct control *dialog_find_control( msi_dialog *dialog, const WCHAR *name ) { - msi_control *control; + struct control *control; if( !name ) return NULL; if( !dialog->hwnd ) return NULL; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + LIST_FOR_EACH_ENTRY( control, &dialog->controls, struct control, entry ) if( !wcscmp( control->name, name ) ) /* FIXME: case sensitive? */ return control; return NULL; } -static msi_control *dialog_find_control_by_type( msi_dialog *dialog, LPCWSTR type ) +static struct control *dialog_find_control_by_type( msi_dialog *dialog, const WCHAR *type ) { - msi_control *control; + struct control *control; if( !type ) return NULL; if( !dialog->hwnd ) return NULL; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + LIST_FOR_EACH_ENTRY( control, &dialog->controls, struct control, entry ) if( !wcscmp( control->type, type ) ) /* FIXME: case sensitive? */ return control; return NULL; } -static msi_control *dialog_find_control_by_hwnd( msi_dialog *dialog, HWND hwnd ) +static struct control *dialog_find_control_by_hwnd( msi_dialog *dialog, HWND hwnd ) { - msi_control *control; + struct control *control; if( !dialog->hwnd ) return NULL; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + LIST_FOR_EACH_ENTRY( control, &dialog->controls, struct control, entry ) if( hwnd == control->hwnd ) return control; return NULL; @@ -279,7 +271,7 @@ static WCHAR *dialog_get_style( const WCHAR *p, const WCHAR **rest ) static UINT dialog_add_font( MSIRECORD *rec, void *param ) { msi_dialog *dialog = param; - msi_font *font; + struct font *font; LPCWSTR face, name; LOGFONTW lf; INT style; @@ -287,7 +279,7 @@ static UINT dialog_add_font( MSIRECORD *rec, void *param ) /* create a font and add it to the list */ name = MSI_RecordGetString( rec, 1 ); - font = malloc( offsetof( msi_font, name[wcslen( name ) + 1] ) ); + font = malloc( offsetof( struct font, name[wcslen( name ) + 1] ) ); lstrcpyW( font->name, name ); list_add_head( &dialog->fonts, &font->entry ); @@ -322,11 +314,11 @@ static UINT dialog_add_font( MSIRECORD *rec, void *param ) return ERROR_SUCCESS; } -static msi_font *dialog_find_font( msi_dialog *dialog, const WCHAR *name ) +static struct font *dialog_find_font( msi_dialog *dialog, const WCHAR *name ) { - msi_font *font = NULL; + struct font *font = NULL; - LIST_FOR_EACH_ENTRY( font, &dialog->fonts, msi_font, entry ) + LIST_FOR_EACH_ENTRY( font, &dialog->fonts, struct font, entry ) if( !wcscmp( font->name, name ) ) /* FIXME: case sensitive? */ break; @@ -335,7 +327,7 @@ static msi_font *dialog_find_font( msi_dialog *dialog, const WCHAR *name ) static UINT dialog_set_font( msi_dialog *dialog, HWND hwnd, const WCHAR *name ) { - msi_font *font; + struct font *font; font = dialog_find_font( dialog, name ); if( font ) @@ -361,7 +353,7 @@ static UINT dialog_build_font_list( msi_dialog *dialog ) return r; } -static void destroy_control( msi_control *t ) +static void destroy_control( struct control *t ) { list_remove( &t->entry ); /* leave dialog->hwnd - destroying parent destroys child windows */ @@ -380,18 +372,18 @@ static void destroy_control( msi_control *t ) free( t ); } -static msi_control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DWORD exstyle, - const WCHAR *szCls, const WCHAR *name, const WCHAR *text, - DWORD style, HWND parent ) +static struct control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DWORD exstyle, + const WCHAR *szCls, const WCHAR *name, const WCHAR *text, + DWORD style, HWND parent ) { DWORD x, y, width, height; LPWSTR font = NULL, title_font = NULL; LPCWSTR title = NULL; - msi_control *control; + struct control *control; style |= WS_CHILD; - control = malloc( offsetof( msi_control, name[wcslen( name ) + 1] ) ); + control = malloc( offsetof( struct control, name[wcslen( name ) + 1] ) ); if (!control) return NULL; @@ -505,9 +497,9 @@ static HICON load_icon( MSIDATABASE *db, const WCHAR *text, UINT attributes ) static void dialog_update_controls( msi_dialog *dialog, const WCHAR *property ) { - msi_control *control; + struct control *control; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + LIST_FOR_EACH_ENTRY( control, &dialog->controls, struct control, entry ) { if ( control->property && !wcscmp( control->property, property ) && control->update ) control->update( dialog, control ); @@ -516,9 +508,9 @@ static void dialog_update_controls( msi_dialog *dialog, const WCHAR *property ) static void dialog_update_all_controls( msi_dialog *dialog ) { - msi_control *control; + struct control *control; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + LIST_FOR_EACH_ENTRY( control, &dialog->controls, struct control, entry ) { if ( control->property && control->update ) control->update( dialog, control ); @@ -552,7 +544,7 @@ struct msi_selection_tree_info HTREEITEM selected; }; -static MSIFEATURE *seltree_get_selected_feature( msi_control *control ) +static MSIFEATURE *seltree_get_selected_feature( struct control *control ) { struct msi_selection_tree_info *info = GetPropW( control->hwnd, L"MSIDATA" ); return seltree_feature_from_item( control->hwnd, info->selected ); @@ -560,7 +552,7 @@ static MSIFEATURE *seltree_get_selected_feature( msi_control *control ) static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control, const WCHAR *attribute, MSIRECORD *rec ) { - msi_control* ctrl; + struct control* ctrl; ctrl = dialog_find_control( dialog, control ); if (!ctrl) @@ -718,7 +710,7 @@ static void dialog_map_events( msi_dialog *dialog, const WCHAR *control ) } /* everything except radio buttons */ -static msi_control *dialog_add_control( msi_dialog *dialog, MSIRECORD *rec, const WCHAR *szCls, DWORD style ) +static struct control *dialog_add_control( msi_dialog *dialog, MSIRECORD *rec, const WCHAR *szCls, DWORD style ) { DWORD attributes; const WCHAR *text = NULL, *name, *control_type; @@ -745,7 +737,7 @@ static msi_control *dialog_add_control( msi_dialog *dialog, MSIRECORD *rec, cons struct msi_text_info { - msi_font *font; + struct font *font; WNDPROC oldproc; DWORD attributes; }; @@ -801,7 +793,7 @@ static LRESULT WINAPI MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM static UINT dialog_text_control( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; struct msi_text_info *info; LPCWSTR text, ptr, prop, control_name; LPWSTR font_name; @@ -918,7 +910,7 @@ static UINT dialog_control_event( MSIRECORD *rec, void *param ) return ERROR_SUCCESS; } -static UINT dialog_button_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_button_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { MSIQUERY *view; UINT r; @@ -1015,7 +1007,7 @@ end: static UINT dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; UINT attributes, style, cx = 0, cy = 0, flags = 0; WCHAR *name = NULL; @@ -1096,7 +1088,7 @@ static WCHAR *get_checkbox_value( msi_dialog *dialog, const WCHAR *prop ) return ret; } -static UINT dialog_get_checkbox_state( msi_dialog *dialog, msi_control *control ) +static UINT dialog_get_checkbox_state( msi_dialog *dialog, struct control *control ) { WCHAR state[2] = {0}; DWORD sz = 2; @@ -1105,7 +1097,7 @@ static UINT dialog_get_checkbox_state( msi_dialog *dialog, msi_control *control return state[0] ? 1 : 0; } -static void dialog_set_checkbox_state( msi_dialog *dialog, msi_control *control, UINT state ) +static void dialog_set_checkbox_state( msi_dialog *dialog, struct control *control, UINT state ) { LPCWSTR val; @@ -1125,13 +1117,13 @@ static void dialog_set_checkbox_state( msi_dialog *dialog, msi_control *control, dialog_set_property( dialog->package, control->property, val ); } -static void dialog_checkbox_sync_state( msi_dialog *dialog, msi_control *control ) +static void dialog_checkbox_sync_state( msi_dialog *dialog, struct control *control ) { UINT state = dialog_get_checkbox_state( dialog, control ); SendMessageW( control->hwnd, BM_SETCHECK, state ? BST_CHECKED : BST_UNCHECKED, 0 ); } -static UINT dialog_checkbox_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_checkbox_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { UINT state; @@ -1150,7 +1142,7 @@ static UINT dialog_checkbox_handler( msi_dialog *dialog, msi_control *control, W static UINT dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop; TRACE("%p %p\n", dialog, rec); @@ -1175,7 +1167,7 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) LPCWSTR name; DWORD style, exstyle = 0; DWORD x, y, width, height; - msi_control *control; + struct control *control; TRACE("%p %p\n", dialog, rec); @@ -1193,7 +1185,7 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) dialog_map_events( dialog, name ); - control = malloc( offsetof( msi_control, name[wcslen( name ) + 1] ) ); + control = malloc( offsetof( struct control, name[wcslen( name ) + 1] ) ); if (!control) return ERROR_OUTOFMEMORY; @@ -1234,7 +1226,7 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) struct msi_scrolltext_info { msi_dialog *dialog; - msi_control *control; + struct control *control; WNDPROC oldproc; }; @@ -1287,7 +1279,7 @@ static DWORD CALLBACK richedit_stream_in( DWORD_PTR arg, BYTE *buffer, LONG coun return 0; } -static void scrolltext_add_text( msi_control *control, const WCHAR *text ) +static void scrolltext_add_text( struct control *control, const WCHAR *text ) { struct msi_streamin_info info; EDITSTREAM es; @@ -1308,7 +1300,7 @@ static void scrolltext_add_text( msi_control *control, const WCHAR *text ) static UINT dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) { struct msi_scrolltext_info *info; - msi_control *control; + struct control *control; HMODULE hRichedit; LPCWSTR text; DWORD style; @@ -1351,7 +1343,7 @@ static UINT dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) { UINT cx, cy, flags, style, attributes; - msi_control *control; + struct control *control; LPWSTR name; flags = LR_LOADFROMFILE; @@ -1385,7 +1377,7 @@ static UINT dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; DWORD attributes; LPWSTR name; @@ -1492,7 +1484,7 @@ static UINT combobox_add_items( struct msi_combobox_info *info, const WCHAR *pro static UINT dialog_set_control_condition( MSIRECORD *rec, void *param ) { msi_dialog *dialog = param; - msi_control *control; + struct control *control; LPCWSTR name, action, condition; UINT r; @@ -1540,7 +1532,7 @@ static UINT dialog_evaluate_control_conditions( msi_dialog *dialog ) return r; } -static UINT dialog_combobox_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_combobox_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { struct msi_combobox_info *info; int index; @@ -1565,7 +1557,7 @@ static UINT dialog_combobox_handler( msi_dialog *dialog, msi_control *control, W return ERROR_SUCCESS; } -static void dialog_combobox_update( msi_dialog *dialog, msi_control *control ) +static void dialog_combobox_update( msi_dialog *dialog, struct control *control ) { struct msi_combobox_info *info; LPWSTR value, tmp; @@ -1603,7 +1595,7 @@ static void dialog_combobox_update( msi_dialog *dialog, msi_control *control ) static UINT dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { struct msi_combobox_info *info; - msi_control *control; + struct control *control; DWORD attributes, style; LPCWSTR prop; @@ -1650,7 +1642,7 @@ static UINT dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } -static UINT dialog_edit_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_edit_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { LPWSTR buf; @@ -1671,7 +1663,7 @@ static UINT dialog_edit_handler( msi_dialog *dialog, msi_control *control, WPARA static UINT dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop, text; LPWSTR val, begin, end; WCHAR num[MAX_NUM_DIGITS]; @@ -1984,7 +1976,7 @@ static UINT dialog_maskedit_control( msi_dialog *dialog, MSIRECORD *rec ) LPWSTR font_mask, val = NULL, font; struct msi_maskedit_info *info = NULL; UINT ret = ERROR_SUCCESS; - msi_control *control; + struct control *control; LPCWSTR prop, mask; TRACE("\n"); @@ -2050,7 +2042,7 @@ end: static UINT dialog_progress_bar( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; DWORD attributes, style; style = WS_VISIBLE; @@ -2071,11 +2063,11 @@ static UINT dialog_progress_bar( msi_dialog *dialog, MSIRECORD *rec ) struct msi_pathedit_info { msi_dialog *dialog; - msi_control *control; + struct control *control; WNDPROC oldproc; }; -static WCHAR *get_path_property( msi_dialog *dialog, msi_control *control ) +static WCHAR *get_path_property( msi_dialog *dialog, struct control *control ) { WCHAR *prop, *path; BOOL indirect = control->attributes & msidbControlAttributesIndirect; @@ -2085,7 +2077,7 @@ static WCHAR *get_path_property( msi_dialog *dialog, msi_control *control ) return path; } -static void dialog_update_pathedit( msi_dialog *dialog, msi_control *control ) +static void dialog_update_pathedit( msi_dialog *dialog, struct control *control ) { WCHAR *path; @@ -2111,7 +2103,7 @@ static BOOL dialog_verify_path( const WCHAR *path ) } /* returns TRUE if the path is valid, FALSE otherwise */ -static BOOL dialog_onkillfocus( msi_dialog *dialog, msi_control *control ) +static BOOL dialog_onkillfocus( msi_dialog *dialog, struct control *control ) { LPWSTR buf, prop; BOOL indirect; @@ -2174,7 +2166,7 @@ static LRESULT WINAPI MSIPathEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LP static UINT dialog_pathedit_control( msi_dialog *dialog, MSIRECORD *rec ) { struct msi_pathedit_info *info; - msi_control *control; + struct control *control; LPCWSTR prop; info = malloc( sizeof *info ); @@ -2198,7 +2190,7 @@ static UINT dialog_pathedit_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } -static UINT dialog_radiogroup_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_radiogroup_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { if (HIWORD(param) != BN_CLICKED) return ERROR_SUCCESS; @@ -2213,9 +2205,9 @@ static UINT dialog_radiogroup_handler( msi_dialog *dialog, msi_control *control, /* radio buttons are a bit different from normal controls */ static UINT dialog_create_radiobutton( MSIRECORD *rec, void *param ) { - radio_button_group_descr *group = param; + struct radio_button_group_descr *group = param; msi_dialog *dialog = group->dialog; - msi_control *control; + struct control *control; LPCWSTR prop, text, name; DWORD style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTORADIOBUTTON | BS_MULTILINE; @@ -2267,9 +2259,9 @@ static UINT dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec ) { UINT r; LPCWSTR prop; - msi_control *control; + struct control *control; MSIQUERY *view; - radio_button_group_descr group; + struct radio_button_group_descr group; MSIPACKAGE *package = dialog->package; WNDPROC oldproc; DWORD attr, style = WS_GROUP; @@ -2558,7 +2550,7 @@ static void seltree_create_imagelist( HWND hwnd ) SendMessageW( hwnd, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)himl ); } -static UINT dialog_seltree_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_seltree_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { struct msi_selection_tree_info *info = GetPropW( control->hwnd, L"MSIDATA" ); LPNMTREEVIEWW tv = (LPNMTREEVIEWW)param; @@ -2616,7 +2608,7 @@ done: static UINT dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop, control_name; MSIPACKAGE *package = dialog->package; DWORD style; @@ -2662,7 +2654,7 @@ static UINT dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) static UINT dialog_group_box( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; DWORD style; style = BS_GROUPBOX | WS_CHILD | WS_GROUP; @@ -2757,7 +2749,7 @@ static UINT listbox_add_items( struct msi_listbox_info *info, const WCHAR *prope return r; } -static UINT dialog_listbox_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_listbox_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { struct msi_listbox_info *info; int index; @@ -2779,7 +2771,7 @@ static UINT dialog_listbox_handler( msi_dialog *dialog, msi_control *control, WP static UINT dialog_list_box( msi_dialog *dialog, MSIRECORD *rec ) { struct msi_listbox_info *info; - msi_control *control; + struct control *control; DWORD attributes, style; LPCWSTR prop; @@ -2821,7 +2813,7 @@ static UINT dialog_list_box( msi_dialog *dialog, MSIRECORD *rec ) /******************** Directory Combo ***************************************/ -static void dialog_update_directory_combo( msi_dialog *dialog, msi_control *control ) +static void dialog_update_directory_combo( msi_dialog *dialog, struct control *control ) { WCHAR *path; @@ -2840,7 +2832,7 @@ static void dialog_update_directory_combo( msi_dialog *dialog, msi_control *cont static UINT dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop; DWORD style; @@ -2862,7 +2854,7 @@ static UINT dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) /******************** Directory List ***************************************/ -static void dialog_update_directory_list( msi_dialog *dialog, msi_control *control ) +static void dialog_update_directory_list( msi_dialog *dialog, struct control *control ) { WCHAR dir_spec[MAX_PATH], *path; WIN32_FIND_DATAW wfd; @@ -2909,7 +2901,7 @@ static void dialog_update_directory_list( msi_dialog *dialog, msi_control *contr static UINT dialog_directorylist_up( msi_dialog *dialog ) { - msi_control *control; + struct control *control; LPWSTR prop, path, ptr; BOOL indirect; @@ -2965,7 +2957,7 @@ static WCHAR *get_unique_folder_name( const WCHAR *root, int *ret_len ) static UINT dialog_directorylist_new( msi_dialog *dialog ) { - msi_control *control; + struct control *control; WCHAR *path; LVITEMW item; int index; @@ -2988,7 +2980,7 @@ static UINT dialog_directorylist_new( msi_dialog *dialog ) return ERROR_SUCCESS; } -static UINT dialog_dirlist_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_dirlist_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { NMHDR *nmhdr = (NMHDR *)param; WCHAR text[MAX_PATH], *new_path, *path, *prop; @@ -3055,7 +3047,7 @@ static UINT dialog_dirlist_handler( msi_dialog *dialog, msi_control *control, WP static UINT dialog_directory_list( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop; DWORD style; @@ -3102,7 +3094,7 @@ static const WCHAR column_keys[][80] = L"VolumeCostDifference", }; -static void dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control, MSIRECORD *rec ) +static void dialog_vcl_add_columns( msi_dialog *dialog, struct control *control, MSIRECORD *rec ) { LPCWSTR text = MSI_RecordGetString( rec, 10 ); LPCWSTR begin = text, end; @@ -3175,7 +3167,7 @@ static LONGLONG vcl_get_cost( msi_dialog *dialog ) return total_cost; } -static void dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ) +static void dialog_vcl_add_drives( msi_dialog *dialog, struct control *control ) { ULARGE_INTEGER total, unused; LONGLONG difference, cost; @@ -3249,7 +3241,7 @@ static void dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ) static UINT dialog_volumecost_list( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; DWORD style; style = LVS_REPORT | WS_VSCROLL | WS_HSCROLL | LVS_SHAREIMAGELISTS | @@ -3267,7 +3259,7 @@ static UINT dialog_volumecost_list( msi_dialog *dialog, MSIRECORD *rec ) /******************** VolumeSelect Combo ***************************************/ -static UINT dialog_volsel_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_volsel_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { WCHAR text[MAX_PATH]; LPWSTR prop; @@ -3295,7 +3287,7 @@ static UINT dialog_volsel_handler( msi_dialog *dialog, msi_control *control, WPA return ERROR_SUCCESS; } -static void dialog_vsc_add_drives( msi_dialog *dialog, msi_control *control ) +static void dialog_vsc_add_drives( msi_dialog *dialog, struct control *control ) { LPWSTR drives, ptr; DWORD size; @@ -3320,7 +3312,7 @@ static void dialog_vsc_add_drives( msi_dialog *dialog, msi_control *control ) static UINT dialog_volumeselect_combo( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop; DWORD style; @@ -3342,7 +3334,7 @@ static UINT dialog_volumeselect_combo( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } -static UINT dialog_hyperlink_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_hyperlink_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { int len, len_href = ARRAY_SIZE( L"href" ) - 1; const WCHAR *p, *q; @@ -3389,7 +3381,7 @@ static UINT dialog_hyperlink_handler( msi_dialog *dialog, msi_control *control, static UINT dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; DWORD style = WS_CHILD | WS_TABSTOP | WS_GROUP; const WCHAR *text = MSI_RecordGetString( rec, 10 ); int len = lstrlenW( text ); @@ -3419,10 +3411,10 @@ static UINT dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) struct listview_param { msi_dialog *dialog; - msi_control *control; + struct control *control; }; -static UINT dialog_listview_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +static UINT dialog_listview_handler( msi_dialog *dialog, struct control *control, WPARAM param ) { NMHDR *nmhdr = (NMHDR *)param; @@ -3456,7 +3448,7 @@ static UINT listview_add_item( MSIRECORD *rec, void *param ) return ERROR_SUCCESS; } -static UINT listview_add_items( msi_dialog *dialog, msi_control *control ) +static UINT listview_add_items( msi_dialog *dialog, struct control *control ) { MSIQUERY *view; struct listview_param lv_param = { dialog, control }; @@ -3473,7 +3465,7 @@ static UINT listview_add_items( msi_dialog *dialog, msi_control *control ) static UINT dialog_listview( msi_dialog *dialog, MSIRECORD *rec ) { - msi_control *control; + struct control *control; LPCWSTR prop; DWORD style, attributes; LVCOLUMNW col; @@ -3683,7 +3675,7 @@ static void dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, RECT * static void dialog_set_tab_order( msi_dialog *dialog, const WCHAR *first ) { struct list tab_chain; - msi_control *control; + struct control *control; HWND prev = HWND_TOP; list_init( &tab_chain ); @@ -3698,7 +3690,7 @@ static void dialog_set_tab_order( msi_dialog *dialog, const WCHAR *first ) control = dialog_find_control( dialog, control->tabnext ); } - LIST_FOR_EACH_ENTRY( control, &tab_chain, msi_control, entry ) + LIST_FOR_EACH_ENTRY( control, &tab_chain, struct control, entry ) { SetWindowPos( control->hwnd, prev, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW | @@ -3765,7 +3757,7 @@ static LRESULT dialog_oncreate( HWND hwnd, CREATESTRUCTW *cs ) static LRESULT dialog_oncommand( msi_dialog *dialog, WPARAM param, HWND hwnd ) { - msi_control *control = NULL; + struct control *control = NULL; TRACE( "%p, %#Ix, %p\n", dialog, param, hwnd ); @@ -3796,7 +3788,7 @@ static LRESULT dialog_oncommand( msi_dialog *dialog, WPARAM param, HWND hwnd ) static LRESULT dialog_onnotify( msi_dialog *dialog, LPARAM param ) { LPNMHDR nmhdr = (LPNMHDR) param; - msi_control *control = dialog_find_control_by_hwnd( dialog, nmhdr->hwndFrom ); + struct control *control = dialog_find_control_by_hwnd( dialog, nmhdr->hwndFrom ); TRACE("%p %p\n", dialog, nmhdr->hwndFrom); @@ -3970,7 +3962,7 @@ static BOOL dialog_register_class( void ) } static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, - control_event_handler event_handler ) + UINT (*event_handler)(msi_dialog *, const WCHAR *, const WCHAR *) ) { MSIRECORD *rec = NULL; msi_dialog *dialog; @@ -4094,7 +4086,7 @@ static void event_cleanup_subscriptions( MSIPACKAGE *package, const WCHAR *dialo void msi_dialog_destroy( msi_dialog *dialog ) { - msi_font *font, *next; + struct font *font, *next; if( uiThreadId != GetCurrentThreadId() ) { @@ -4114,15 +4106,14 @@ void msi_dialog_destroy( msi_dialog *dialog ) /* destroy the list of controls */ while( !list_empty( &dialog->controls ) ) { - msi_control *t; + struct control *t; - t = LIST_ENTRY( list_head( &dialog->controls ), - msi_control, entry ); + t = LIST_ENTRY( list_head( &dialog->controls ), struct control, entry ); destroy_control( t ); } /* destroy the list of fonts */ - LIST_FOR_EACH_ENTRY_SAFE( font, next, &dialog->fonts, msi_font, entry ) + LIST_FOR_EACH_ENTRY_SAFE( font, next, &dialog->fonts, struct font, entry ) { list_remove( &font->entry ); DeleteObject( font->hfont ); @@ -4282,7 +4273,7 @@ UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, const char *szControlName, struct control_event { const WCHAR *event; - event_handler handler; + UINT (*handler)( msi_dialog *, const WCHAR * ); }; static UINT dialog_event_handler( msi_dialog *, const WCHAR *, const WCHAR * ); diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index 23e74e17edc..d1b99f9ca64 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -35,25 +35,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -typedef struct tagDISTINCTSET +struct distinct_set { UINT val; UINT count; UINT row; - struct tagDISTINCTSET *nextrow; - struct tagDISTINCTSET *nextcol; -} DISTINCTSET; + struct distinct_set *nextrow; + struct distinct_set *nextcol; +}; -typedef struct tagMSIDISTINCTVIEW +struct distinct_view { MSIVIEW view; MSIDATABASE *db; MSIVIEW *table; UINT row_count; UINT *translation; -} MSIDISTINCTVIEW; +}; -static DISTINCTSET ** distinct_insert( DISTINCTSET **x, UINT val, UINT row ) +static struct distinct_set **distinct_insert( struct distinct_set **x, UINT val, UINT row ) { /* horrible O(n) find */ while( *x ) @@ -67,7 +67,7 @@ static DISTINCTSET ** distinct_insert( DISTINCTSET **x, UINT val, UINT row ) } /* nothing found, so add one */ - *x = malloc( sizeof(DISTINCTSET) ); + *x = malloc( sizeof(**x) ); if( *x ) { (*x)->val = val; @@ -79,11 +79,11 @@ static DISTINCTSET ** distinct_insert( DISTINCTSET **x, UINT val, UINT row ) return x; } -static void distinct_free( DISTINCTSET *x ) +static void distinct_free( struct distinct_set *x ) { while( x ) { - DISTINCTSET *next = x->nextrow; + struct distinct_set *next = x->nextrow; distinct_free( x->nextcol ); free( x ); x = next; @@ -92,7 +92,7 @@ static void distinct_free( DISTINCTSET *x ) static UINT DISTINCT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; TRACE("%p %d %d %p\n", dv, row, col, val ); @@ -109,9 +109,9 @@ static UINT DISTINCT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UIN static UINT DISTINCT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; UINT r, i, j, r_count, c_count; - DISTINCTSET *rowset = NULL; + struct distinct_set *rowset = NULL; TRACE("%p %p\n", dv, record); @@ -133,7 +133,7 @@ static UINT DISTINCT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) /* build it */ for( i=0; i<r_count; i++ ) { - DISTINCTSET **x = &rowset; + struct distinct_set **x = &rowset; for( j=1; j<=c_count; j++ ) { @@ -171,7 +171,7 @@ static UINT DISTINCT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) static UINT DISTINCT_close( struct tagMSIVIEW *view ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; TRACE("%p\n", dv ); @@ -187,7 +187,7 @@ static UINT DISTINCT_close( struct tagMSIVIEW *view ) static UINT DISTINCT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; TRACE("%p %p %p\n", dv, rows, cols ); @@ -207,7 +207,7 @@ static UINT DISTINCT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT * static UINT DISTINCT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; TRACE("%p %d %p %p %p %p\n", dv, n, name, type, temporary, table_name ); @@ -221,7 +221,7 @@ static UINT DISTINCT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR * static UINT DISTINCT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; TRACE("%p %d %p\n", dv, eModifyMode, rec ); @@ -233,7 +233,7 @@ static UINT DISTINCT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT DISTINCT_delete( struct tagMSIVIEW *view ) { - MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view; + struct distinct_view *dv = (struct distinct_view *)view; TRACE("%p\n", dv ); @@ -272,7 +272,7 @@ static const MSIVIEWOPS distinct_ops = UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) { - MSIDISTINCTVIEW *dv = NULL; + struct distinct_view *dv = NULL; UINT count = 0, r; TRACE("%p\n", dv ); diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 9c3aebba0eb..9c7fc0ca0ea 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -34,18 +34,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -typedef struct tagMSIDROPVIEW +struct drop_view { MSIVIEW view; MSIDATABASE *db; MSIVIEW *table; column_info *colinfo; INT hold; -} MSIDROPVIEW; +}; static UINT DROP_execute(struct tagMSIVIEW *view, MSIRECORD *record) { - MSIDROPVIEW *dv = (MSIDROPVIEW*)view; + struct drop_view *dv = (struct drop_view *)view; UINT r; TRACE("%p %p\n", dv, record); @@ -62,7 +62,7 @@ static UINT DROP_execute(struct tagMSIVIEW *view, MSIRECORD *record) static UINT DROP_close(struct tagMSIVIEW *view) { - MSIDROPVIEW *dv = (MSIDROPVIEW*)view; + struct drop_view *dv = (struct drop_view *)view; TRACE("%p\n", dv); @@ -71,7 +71,7 @@ static UINT DROP_close(struct tagMSIVIEW *view) static UINT DROP_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols) { - MSIDROPVIEW *dv = (MSIDROPVIEW*)view; + struct drop_view *dv = (struct drop_view *)view; TRACE("%p %p %p\n", dv, rows, cols); @@ -80,7 +80,7 @@ static UINT DROP_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols) static UINT DROP_delete( struct tagMSIVIEW *view ) { - MSIDROPVIEW *dv = (MSIDROPVIEW*)view; + struct drop_view *dv = (struct drop_view *)view; TRACE("%p\n", dv ); @@ -117,7 +117,7 @@ static const MSIVIEWOPS drop_ops = UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, LPCWSTR name) { - MSIDROPVIEW *dv; + struct drop_view *dv; UINT r; TRACE("%p %s\n", view, debugstr_w(name)); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b325d1c4085..96c6c5eaa4b 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -851,14 +851,14 @@ done: #define is_dot_dir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0)))) -typedef struct +struct file_list { struct list entry; LPWSTR sourcename; LPWSTR destname; LPWSTR source; LPWSTR dest; -} FILE_LIST; +}; static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *dest, int options ) { @@ -913,31 +913,31 @@ static WCHAR *wildcard_to_file( const WCHAR *wildcard, const WCHAR *filename ) return path; } -static void free_file_entry(FILE_LIST *file) +static void free_file_entry(struct file_list *file) { free(file->source); free(file->dest); free(file); } -static void free_list(FILE_LIST *list) +static void free_list(struct file_list *list) { while (!list_empty(&list->entry)) { - FILE_LIST *file = LIST_ENTRY(list_head(&list->entry), FILE_LIST, entry); + struct file_list *file = LIST_ENTRY(list_head(&list->entry), struct file_list, entry); list_remove(&file->entry); free_file_entry(file); } } -static BOOL add_wildcard( FILE_LIST *files, const WCHAR *source, WCHAR *dest ) +static BOOL add_wildcard( struct file_list *files, const WCHAR *source, WCHAR *dest ) { - FILE_LIST *new, *file; + struct file_list *new, *file; WCHAR *ptr, *filename; DWORD size; - new = calloc(1, sizeof(FILE_LIST)); + new = calloc(1, sizeof(*new)); if (!new) return FALSE; @@ -969,7 +969,7 @@ static BOOL add_wildcard( FILE_LIST *files, const WCHAR *source, WCHAR *dest ) return TRUE; } - LIST_FOR_EACH_ENTRY(file, &files->entry, FILE_LIST, entry) + LIST_FOR_EACH_ENTRY(file, &files->entry, struct file_list, entry) { if (wcscmp( source, file->source ) < 0) { @@ -988,7 +988,7 @@ static BOOL move_files_wildcard( MSIPACKAGE *package, const WCHAR *source, WCHAR HANDLE hfile; LPWSTR path; BOOL res; - FILE_LIST files, *file; + struct file_list files, *file; DWORD size; hfile = msi_find_first_file( package, source, &wfd ); @@ -1016,7 +1016,7 @@ static BOOL move_files_wildcard( MSIPACKAGE *package, const WCHAR *source, WCHAR goto done; /* only the first wildcard match gets renamed to dest */ - file = LIST_ENTRY(list_head(&files.entry), FILE_LIST, entry); + file = LIST_ENTRY(list_head(&files.entry), struct file_list, entry); size = (wcsrchr(file->dest, '\\') - file->dest) + lstrlenW(file->destname) + 2; file->dest = realloc(file->dest, size * sizeof(WCHAR)); if (!file->dest) @@ -1034,7 +1034,7 @@ static BOOL move_files_wildcard( MSIPACKAGE *package, const WCHAR *source, WCHAR while (!list_empty(&files.entry)) { - file = LIST_ENTRY(list_head(&files.entry), FILE_LIST, entry); + file = LIST_ENTRY(list_head(&files.entry), struct file_list, entry); move_file( package, file->source, file->dest, options ); diff --git a/dlls/msi/font.c b/dlls/msi/font.c index b4eadbc8968..6a4057f6901 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -28,40 +28,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -typedef struct _tagTT_OFFSET_TABLE { +struct offset_table +{ USHORT uMajorVersion; USHORT uMinorVersion; USHORT uNumOfTables; USHORT uSearchRange; USHORT uEntrySelector; USHORT uRangeShift; -} TT_OFFSET_TABLE; +}; -typedef struct _tagTT_TABLE_DIRECTORY { +struct table_directory +{ char szTag[4]; /* table name */ ULONG uCheckSum; /* Check sum */ ULONG uOffset; /* Offset from beginning of file */ ULONG uLength; /* length of the table in bytes */ -} TT_TABLE_DIRECTORY; +}; -typedef struct _tagTT_NAME_TABLE_HEADER { +struct name_table_header +{ USHORT uFSelector; /* format selector. Always 0 */ USHORT uNRCount; /* Name Records count */ - USHORT uStorageOffset; /* Offset for strings storage, - * from start of the table */ -} TT_NAME_TABLE_HEADER; + USHORT uStorageOffset; /* Offset for strings storage from start of the table */ +}; #define NAME_ID_FULL_FONT_NAME 4 #define NAME_ID_VERSION 5 -typedef struct _tagTT_NAME_RECORD { +struct name_record +{ USHORT uPlatformID; USHORT uEncodingID; USHORT uLanguageID; USHORT uNameID; USHORT uStringLength; USHORT uStringOffset; /* from start of storage area */ -} TT_NAME_RECORD; +}; #define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) #define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x))) @@ -72,11 +75,11 @@ typedef struct _tagTT_NAME_RECORD { */ static WCHAR *load_ttf_name_id( MSIPACKAGE *package, const WCHAR *filename, DWORD id ) { - TT_TABLE_DIRECTORY tblDir; + struct table_directory tblDir; BOOL bFound = FALSE; - TT_OFFSET_TABLE ttOffsetTable; - TT_NAME_TABLE_HEADER ttNTHeader; - TT_NAME_RECORD ttRecord; + struct offset_table ttOffsetTable; + struct name_table_header ttNTHeader; + struct name_record ttRecord; DWORD dwRead; HANDLE handle; LPWSTR ret = NULL; @@ -92,7 +95,7 @@ static WCHAR *load_ttf_name_id( MSIPACKAGE *package, const WCHAR *filename, DWOR return NULL; } - if (!ReadFile(handle,&ttOffsetTable, sizeof(TT_OFFSET_TABLE),&dwRead,NULL)) + if (!ReadFile(handle,&ttOffsetTable, sizeof(struct offset_table),&dwRead,NULL)) goto end; ttOffsetTable.uNumOfTables = SWAPWORD(ttOffsetTable.uNumOfTables); @@ -105,7 +108,7 @@ static WCHAR *load_ttf_name_id( MSIPACKAGE *package, const WCHAR *filename, DWOR for (i=0; i< ttOffsetTable.uNumOfTables; i++) { - if (!ReadFile(handle,&tblDir, sizeof(TT_TABLE_DIRECTORY),&dwRead,NULL)) + if (!ReadFile(handle, &tblDir, sizeof(tblDir), &dwRead, NULL)) break; if (memcmp(tblDir.szTag,"name",4)==0) { @@ -120,14 +123,14 @@ static WCHAR *load_ttf_name_id( MSIPACKAGE *package, const WCHAR *filename, DWOR goto end; SetFilePointer(handle, tblDir.uOffset, NULL, FILE_BEGIN); - if (!ReadFile(handle,&ttNTHeader, sizeof(TT_NAME_TABLE_HEADER), &dwRead,NULL)) + if (!ReadFile(handle, &ttNTHeader, sizeof(ttNTHeader), &dwRead, NULL)) goto end; ttNTHeader.uNRCount = SWAPWORD(ttNTHeader.uNRCount); ttNTHeader.uStorageOffset = SWAPWORD(ttNTHeader.uStorageOffset); for(i=0; i<ttNTHeader.uNRCount; i++) { - if (!ReadFile(handle,&ttRecord, sizeof(TT_NAME_RECORD),&dwRead,NULL)) + if (!ReadFile(handle, &ttRecord, sizeof(ttRecord), &dwRead, NULL)) break; ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 8802756d88c..1d2d61f787d 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); #define left_type(x) (x & 0xF0) -typedef struct _tagFORMAT +struct format { MSIPACKAGE *package; MSIRECORD *record; @@ -64,9 +64,9 @@ typedef struct _tagFORMAT BOOL propfailed; BOOL groupfailed; int groups; -} FORMAT; +}; -typedef struct _tagFORMSTR +struct form_str { struct list entry; int n; @@ -74,25 +74,25 @@ typedef struct _tagFORMSTR int type; BOOL propfound; BOOL nonprop; -} FORMSTR; +}; -typedef struct _tagSTACK +struct stack { struct list items; -} STACK; +}; -static STACK *create_stack(void) +static struct stack *create_stack(void) { - STACK *stack = malloc(sizeof(STACK)); + struct stack *stack = malloc(sizeof(*stack)); list_init(&stack->items); return stack; } -static void free_stack(STACK *stack) +static void free_stack(struct stack *stack) { while (!list_empty(&stack->items)) { - FORMSTR *str = LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + struct form_str *str = LIST_ENTRY(list_head(&stack->items), struct form_str, entry); list_remove(&str->entry); free(str); } @@ -100,28 +100,28 @@ static void free_stack(STACK *stack) free(stack); } -static void stack_push(STACK *stack, FORMSTR *str) +static void stack_push(struct stack *stack, struct form_str *str) { list_add_head(&stack->items, &str->entry); } -static FORMSTR *stack_pop(STACK *stack) +static struct form_str *stack_pop(struct stack *stack) { - FORMSTR *ret; + struct form_str *ret; if (list_empty(&stack->items)) return NULL; - ret = LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + ret = LIST_ENTRY(list_head(&stack->items), struct form_str, entry); list_remove(&ret->entry); return ret; } -static FORMSTR *stack_find(STACK *stack, int type) +static struct form_str *stack_find(struct stack *stack, int type) { - FORMSTR *str; + struct form_str *str; - LIST_FOR_EACH_ENTRY(str, &stack->items, FORMSTR, entry) + LIST_FOR_EACH_ENTRY(str, &stack->items, struct form_str, entry) { if (str->type == type) return str; @@ -130,17 +130,17 @@ static FORMSTR *stack_find(STACK *stack, int type) return NULL; } -static FORMSTR *stack_peek(STACK *stack) +static struct form_str *stack_peek(struct stack *stack) { - return LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + return LIST_ENTRY(list_head(&stack->items), struct form_str, entry); } -static LPCWSTR get_formstr_data(FORMAT *format, FORMSTR *str) +static const WCHAR *get_formstr_data(struct format *format, struct form_str *str) { return &format->deformatted[str->n]; } -static WCHAR *dup_formstr( FORMAT *format, FORMSTR *str, int *ret_len ) +static WCHAR *dup_formstr( struct format *format, struct form_str *str, int *ret_len ) { WCHAR *val; @@ -154,7 +154,7 @@ static WCHAR *dup_formstr( FORMAT *format, FORMSTR *str, int *ret_len ) return val; } -static WCHAR *deformat_index( FORMAT *format, FORMSTR *str, int *ret_len ) +static WCHAR *deformat_index( struct format *format, struct form_str *str, int *ret_len ) { WCHAR *val, *ret; DWORD len; @@ -180,7 +180,7 @@ static WCHAR *deformat_index( FORMAT *format, FORMSTR *str, int *ret_len ) return ret; } -static WCHAR *deformat_property( FORMAT *format, FORMSTR *str, int *ret_len ) +static WCHAR *deformat_property( struct format *format, struct form_str *str, int *ret_len ) { WCHAR *prop, *ret; DWORD len = 0; @@ -203,7 +203,7 @@ static WCHAR *deformat_property( FORMAT *format, FORMSTR *str, int *ret_len ) return ret; } -static WCHAR *deformat_component( FORMAT *format, FORMSTR *str, int *ret_len ) +static WCHAR *deformat_component( struct format *format, struct form_str *str, int *ret_len ) { WCHAR *key, *ret; MSICOMPONENT *comp; @@ -227,7 +227,7 @@ static WCHAR *deformat_component( FORMAT *format, FORMSTR *str, int *ret_len ) return ret; } -static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int *ret_len ) +static WCHAR *deformat_file( struct format *format, struct form_str *str, BOOL shortname, int *ret_len ) { WCHAR *key, *ret = NULL; const MSIFILE *file; @@ -257,7 +257,7 @@ done: return ret; } -static WCHAR *deformat_environment( FORMAT *format, FORMSTR *str, int *ret_len ) +static WCHAR *deformat_environment( struct format *format, struct form_str *str, int *ret_len ) { WCHAR *key, *ret = NULL; DWORD len; @@ -275,7 +275,7 @@ static WCHAR *deformat_environment( FORMAT *format, FORMSTR *str, int *ret_len ) return ret; } -static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound, +static WCHAR *deformat_literal( struct format *format, struct form_str *str, BOOL *propfound, int *type, int *len ) { LPCWSTR data = get_formstr_data(format, str); @@ -389,10 +389,10 @@ static BOOL format_is_literal(WCHAR x) return (format_is_alpha(x) || format_is_number(x)); } -static int format_lex(FORMAT *format, FORMSTR **out) +static int format_lex(struct format *format, struct form_str **out) { int type, len = 1; - FORMSTR *str; + struct form_str *str; LPCWSTR data; WCHAR ch; @@ -401,7 +401,7 @@ static int format_lex(FORMAT *format, FORMSTR **out) if (!format->deformatted) return FORMAT_NULL; - *out = calloc(1, sizeof(FORMSTR)); + *out = calloc(1, sizeof(**out)); if (!*out) return FORMAT_FAIL; @@ -473,10 +473,10 @@ static int format_lex(FORMAT *format, FORMSTR **out) return type; } -static FORMSTR *format_replace( FORMAT *format, BOOL propfound, BOOL nonprop, - int oldsize, int type, WCHAR *replace, int len ) +static struct form_str *format_replace( struct format *format, BOOL propfound, BOOL nonprop, + int oldsize, int type, WCHAR *replace, int len ) { - FORMSTR *ret; + struct form_str *ret; LPWSTR str, ptr; DWORD size = 0; int n; @@ -533,7 +533,7 @@ static FORMSTR *format_replace( FORMAT *format, BOOL propfound, BOOL nonprop, if (!replace) return NULL; - ret = calloc(1, sizeof(FORMSTR)); + ret = calloc(1, sizeof(*ret)); if (!ret) return NULL; @@ -546,12 +546,12 @@ static FORMSTR *format_replace( FORMAT *format, BOOL propfound, BOOL nonprop, return ret; } -static WCHAR *replace_stack_group( FORMAT *format, STACK *values, +static WCHAR *replace_stack_group( struct format *format, struct stack *values, BOOL *propfound, BOOL *nonprop, int *oldsize, int *type, int *len ) { WCHAR *replaced; - FORMSTR *content, *node; + struct form_str *content, *node; int n; *nonprop = FALSE; @@ -575,7 +575,7 @@ static WCHAR *replace_stack_group( FORMAT *format, STACK *values, free(node); } - content = calloc(1, sizeof(FORMSTR)); + content = calloc(1, sizeof(*content)); content->n = n; content->len = *oldsize; content->type = FORMAT_LITERAL; @@ -616,12 +616,12 @@ static WCHAR *replace_stack_group( FORMAT *format, STACK *values, return replaced; } -static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, +static WCHAR *replace_stack_prop( struct format *format, struct stack *values, BOOL *propfound, BOOL *nonprop, int *oldsize, int *type, int *len ) { WCHAR *replaced; - FORMSTR *content, *node; + struct form_str *content, *node; int n; *propfound = FALSE; @@ -644,7 +644,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, free(node); } - content = calloc(1, sizeof(FORMSTR)); + content = calloc(1, sizeof(*content)); content->n = n + 1; content->len = *oldsize - 2; content->type = *type; @@ -676,10 +676,10 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, return replaced; } -static UINT replace_stack(FORMAT *format, STACK *stack, STACK *values) +static UINT replace_stack(struct format *format, struct stack *stack, struct stack *values) { WCHAR *replaced = NULL; - FORMSTR *beg, *top, *node; + struct form_str *beg, *top, *node; BOOL propfound = FALSE, nonprop = FALSE, group = FALSE; int type, n, len = 0, oldsize = 0; @@ -757,10 +757,10 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data, DWORD *len, MSIRECORD* record) { - FORMAT format; - FORMSTR *str = NULL; - STACK *stack, *temp; - FORMSTR *node; + struct format format; + struct form_str *str = NULL; + struct stack *stack, *temp; + struct form_str *node; int type; if (!ptr) @@ -773,7 +773,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, *data = wcsdup(ptr); *len = lstrlenW(ptr); - ZeroMemory(&format, sizeof(FORMAT)); + ZeroMemory(&format, sizeof(format)); format.package = package; format.record = record; format.deformatted = *data; diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index d14300a0b7a..ffa870e08ac 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ -typedef struct tagMSIINSERTVIEW +struct insert_view { MSIVIEW view; MSIVIEW *table; @@ -46,11 +46,11 @@ typedef struct tagMSIINSERTVIEW BOOL bIsTemp; MSIVIEW *sv; column_info *vals; -} MSIINSERTVIEW; +}; static UINT INSERT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; TRACE("%p %d %d %p\n", iv, row, col, val ); @@ -106,7 +106,7 @@ err: /* checks to see if the column order specified in the INSERT query * matches the column order of the table */ -static BOOL columns_in_order(MSIINSERTVIEW *iv, UINT col_count) +static BOOL columns_in_order(struct insert_view *iv, UINT col_count) { LPCWSTR a, b; UINT i; @@ -124,7 +124,7 @@ static BOOL columns_in_order(MSIINSERTVIEW *iv, UINT col_count) /* rearranges the data in the record to be inserted based on column order, * and pads the record for any missing columns in the INSERT query */ -static UINT arrange_record(MSIINSERTVIEW *iv, MSIRECORD **values) +static UINT arrange_record(struct insert_view *iv, MSIRECORD **values) { MSIRECORD *padded; UINT col_count, val_count; @@ -176,7 +176,7 @@ err: return r; } -static BOOL row_has_null_primary_keys(MSIINSERTVIEW *iv, MSIRECORD *row) +static BOOL row_has_null_primary_keys(struct insert_view *iv, MSIRECORD *row) { UINT r, i, col_count, type; @@ -203,7 +203,7 @@ static BOOL row_has_null_primary_keys(MSIINSERTVIEW *iv, MSIRECORD *row) static UINT INSERT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; UINT r, row = -1, col_count = 0; MSIVIEW *sv; MSIRECORD *values = NULL; @@ -251,7 +251,7 @@ err: static UINT INSERT_close( struct tagMSIVIEW *view ) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; MSIVIEW *sv; TRACE("%p\n", iv); @@ -265,7 +265,7 @@ static UINT INSERT_close( struct tagMSIVIEW *view ) static UINT INSERT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; MSIVIEW *sv; TRACE("%p %p %p\n", iv, rows, cols ); @@ -280,7 +280,7 @@ static UINT INSERT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co static UINT INSERT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; MSIVIEW *sv; TRACE("%p %d %p %p %p %p\n", iv, n, name, type, temporary, table_name ); @@ -294,7 +294,7 @@ static UINT INSERT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na static UINT INSERT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; TRACE("%p %d %p\n", iv, eModifyMode, rec ); @@ -303,7 +303,7 @@ static UINT INSERT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE static UINT INSERT_delete( struct tagMSIVIEW *view ) { - MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view; + struct insert_view *iv = (struct insert_view *)view; MSIVIEW *sv; TRACE("%p\n", iv ); @@ -351,7 +351,7 @@ static UINT count_column_info( const column_info *ci ) UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *columns, column_info *values, BOOL temp ) { - MSIINSERTVIEW *iv = NULL; + struct insert_view *iv = NULL; UINT r; MSIVIEW *tv = NULL, *sv = NULL; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2fcda9144d9..42f2122bed8 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4005,17 +4005,17 @@ UINT WINAPI MsiReinstallFeatureA( const char *szProduct, const char *szFeature, return rc; } -typedef struct +struct md5_ctx { unsigned int i[2]; unsigned int buf[4]; unsigned char in[64]; unsigned char digest[16]; -} MD5_CTX; +}; -extern VOID WINAPI MD5Init( MD5_CTX *); -extern VOID WINAPI MD5Update( MD5_CTX *, const unsigned char *, unsigned int ); -extern VOID WINAPI MD5Final( MD5_CTX *); +extern void WINAPI MD5Init( struct md5_ctx * ); +extern void WINAPI MD5Update( struct md5_ctx *, const unsigned char *, unsigned int ); +extern void WINAPI MD5Final( struct md5_ctx * ); UINT msi_get_filehash( MSIPACKAGE *package, const WCHAR *path, MSIFILEHASHINFO *hash ) { @@ -4039,7 +4039,7 @@ UINT msi_get_filehash( MSIPACKAGE *package, const WCHAR *path, MSIFILEHASHINFO * { if ((p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ))) { - MD5_CTX ctx; + struct md5_ctx ctx; MD5Init( &ctx ); MD5Update( &ctx, p, length ); diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 258489c4ef1..a2b6b6a0503 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -87,20 +87,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -typedef struct tagIClassFactoryImpl { +struct class_factory +{ IClassFactory IClassFactory_iface; - HRESULT (*create_object)( IUnknown*, LPVOID* ); -} IClassFactoryImpl; + HRESULT (*create_object)( IUnknown *, void ** ); +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); } static HRESULT WINAPI MsiCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct class_factory *This = impl_from_IClassFactory(iface); TRACE("%p %s %p\n",This,debugstr_guid(riid),ppobj); @@ -129,7 +130,7 @@ static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) static HRESULT WINAPI MsiCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct class_factory *This = impl_from_IClassFactory(iface); IUnknown *unk = NULL; HRESULT r; @@ -165,7 +166,7 @@ static const IClassFactoryVtbl MsiCF_Vtbl = MsiCF_LockServer }; -static IClassFactoryImpl MsiServer_CF = { { &MsiCF_Vtbl }, create_msiserver }; +static struct class_factory MsiServer_CF = { { &MsiCF_Vtbl }, create_msiserver }; /****************************************************************** * DllGetClassObject [MSI.@] diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4331f8365ee..9e34b7e6351 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -573,11 +573,11 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) return filename; } -typedef struct tagLANGANDCODEPAGE +struct lang_codepage { WORD wLanguage; WORD wCodePage; -} LANGANDCODEPAGE; +}; static void set_msi_assembly_prop(MSIPACKAGE *package) { @@ -586,7 +586,7 @@ static void set_msi_assembly_prop(MSIPACKAGE *package) LPVOID version = NULL; WCHAR buf[MAX_PATH]; LPWSTR fusion, verstr; - LANGANDCODEPAGE *translate; + struct lang_codepage *translate; fusion = get_fusion_filename(package); if (!fusion) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 5e5f3906f4f..2323a8481d4 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -68,7 +68,6 @@ struct complex_expr struct expr *right; }; -struct tagJOINTABLE; union ext_column { struct @@ -79,7 +78,7 @@ union ext_column struct { UINT column; - struct tagJOINTABLE *table; + struct join_table *table; } parsed; }; diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 519beb86a63..f355918b07d 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -50,18 +50,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); #endif /* - * MsiActiveScriptSite - Our IActiveScriptSite implementation. + * struct script_site - Our IActiveScriptSite implementation. */ -typedef struct { +struct script_site +{ IActiveScriptSite IActiveScriptSite_iface; IDispatch *installer; IDispatch *session; LONG ref; -} MsiActiveScriptSite; +}; -static inline MsiActiveScriptSite *impl_from_IActiveScriptSite( IActiveScriptSite *iface ) +static inline struct script_site *impl_from_IActiveScriptSite( IActiveScriptSite *iface ) { - return CONTAINING_RECORD(iface, MsiActiveScriptSite, IActiveScriptSite_iface); + return CONTAINING_RECORD(iface, struct script_site, IActiveScriptSite_iface); } /* @@ -69,7 +70,7 @@ static inline MsiActiveScriptSite *impl_from_IActiveScriptSite( IActiveScriptSit */ static HRESULT WINAPI MsiActiveScriptSite_QueryInterface(IActiveScriptSite* iface, REFIID riid, void** obj) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); @@ -88,7 +89,7 @@ static HRESULT WINAPI MsiActiveScriptSite_QueryInterface(IActiveScriptSite* ifac static ULONG WINAPI MsiActiveScriptSite_AddRef(IActiveScriptSite* iface) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE( "(%p)->(%lu)\n", This, ref ); return ref; @@ -96,7 +97,7 @@ static ULONG WINAPI MsiActiveScriptSite_AddRef(IActiveScriptSite* iface) static ULONG WINAPI MsiActiveScriptSite_Release(IActiveScriptSite* iface) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE( "(%p)->(%lu)\n", This, ref ); @@ -109,14 +110,14 @@ static ULONG WINAPI MsiActiveScriptSite_Release(IActiveScriptSite* iface) static HRESULT WINAPI MsiActiveScriptSite_GetLCID(IActiveScriptSite* iface, LCID* plcid) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE("(%p)->(%p)\n", This, plcid); return E_NOTIMPL; /* Script will use system-defined locale */ } static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown** ppiunkItem, ITypeInfo** ppti) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE( "(%p)->(%p, %lu, %p, %p)\n", This, pstrName, dwReturnMask, ppiunkItem, ppti ); @@ -149,14 +150,14 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, static HRESULT WINAPI MsiActiveScriptSite_GetDocVersionString(IActiveScriptSite* iface, BSTR* pbstrVersion) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE("(%p)->(%p)\n", This, pbstrVersion); return E_NOTIMPL; } static HRESULT WINAPI MsiActiveScriptSite_OnScriptTerminate(IActiveScriptSite* iface, const VARIANT* pvarResult, const EXCEPINFO* pexcepinfo) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE("(%p)->(%p, %p)\n", This, pvarResult, pexcepinfo); return S_OK; } @@ -198,7 +199,7 @@ static HRESULT WINAPI MsiActiveScriptSite_OnStateChange(IActiveScriptSite* iface static HRESULT WINAPI MsiActiveScriptSite_OnScriptError(IActiveScriptSite* iface, IActiveScriptError* pscripterror) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); EXCEPINFO exception; HRESULT hr; @@ -219,14 +220,14 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptError(IActiveScriptSite* iface static HRESULT WINAPI MsiActiveScriptSite_OnEnterScript(IActiveScriptSite* iface) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE("(%p)\n", This); return S_OK; } static HRESULT WINAPI MsiActiveScriptSite_OnLeaveScript(IActiveScriptSite* iface) { - MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); + struct script_site *This = impl_from_IActiveScriptSite(iface); TRACE("(%p)\n", This); return S_OK; } @@ -246,15 +247,15 @@ static const struct IActiveScriptSiteVtbl activescriptsitevtbl = MsiActiveScriptSite_OnLeaveScript }; -static HRESULT create_activescriptsite(MsiActiveScriptSite **obj) +static HRESULT create_activescriptsite(struct script_site **obj) { - MsiActiveScriptSite* object; + struct script_site *object; TRACE("(%p)\n", obj); *obj = NULL; - object = malloc(sizeof(MsiActiveScriptSite)); + object = malloc(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -290,7 +291,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function HRESULT hr; IActiveScript *pActiveScript = NULL; IActiveScriptParse *pActiveScriptParse = NULL; - MsiActiveScriptSite *scriptsite; + struct script_site *scriptsite; IDispatch *pDispatch = NULL; DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; DISPID dispid; diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 1b77d1095d3..cfb17f60b62 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ -typedef struct tagMSISELECTVIEW +struct select_view { MSIVIEW view; MSIDATABASE *db; @@ -46,9 +46,9 @@ typedef struct tagMSISELECTVIEW UINT num_cols; UINT max_cols; UINT cols[1]; -} MSISELECTVIEW; +}; -static UINT translate_record( MSISELECTVIEW *sv, MSIRECORD *in, MSIRECORD **out ) +static UINT translate_record( struct select_view *sv, MSIRECORD *in, MSIRECORD **out ) { UINT r, col_count, i; MSIRECORD *object; @@ -74,7 +74,7 @@ static UINT translate_record( MSISELECTVIEW *sv, MSIRECORD *in, MSIRECORD **out static UINT SELECT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p %d %d %p\n", sv, row, col, val ); @@ -95,7 +95,7 @@ static UINT SELECT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT SELECT_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p %d %d %p\n", sv, row, col, stm ); @@ -116,7 +116,7 @@ static UINT SELECT_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IS static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; UINT i, expanded_mask = 0, r = ERROR_SUCCESS, col_count = 0; MSIRECORD *expanded; @@ -158,7 +158,7 @@ static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U static UINT SELECT_insert_row( struct tagMSIVIEW *view, MSIRECORD *record, UINT row, BOOL temporary ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; UINT table_cols, r; MSIRECORD *outrec; @@ -183,7 +183,7 @@ static UINT SELECT_insert_row( struct tagMSIVIEW *view, MSIRECORD *record, UINT static UINT SELECT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p %p\n", sv, record); @@ -195,7 +195,7 @@ static UINT SELECT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) static UINT SELECT_close( struct tagMSIVIEW *view ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p\n", sv ); @@ -207,7 +207,7 @@ static UINT SELECT_close( struct tagMSIVIEW *view ) static UINT SELECT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p %p %p\n", sv, rows, cols ); @@ -223,7 +223,7 @@ static UINT SELECT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p %d %p %p %p %p\n", sv, n, name, type, temporary, table_name ); @@ -248,7 +248,7 @@ static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; UINT r, i, col, type, val; IStream *stream; LPCWSTR str; @@ -295,7 +295,7 @@ UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row) static UINT SELECT_modify( struct tagMSIVIEW *view, MSIMODIFY mode, MSIRECORD *rec, UINT row ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; MSIRECORD *table_rec; UINT r; @@ -336,7 +336,7 @@ static UINT SELECT_modify( struct tagMSIVIEW *view, MSIMODIFY mode, static UINT SELECT_delete( struct tagMSIVIEW *view ) { - MSISELECTVIEW *sv = (MSISELECTVIEW*)view; + struct select_view *sv = (struct select_view *)view; TRACE("%p\n", sv ); @@ -372,8 +372,7 @@ static const MSIVIEWOPS select_ops = NULL, }; -static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, - LPCWSTR table_name ) +static UINT SELECT_AddColumn( struct select_view *sv, const WCHAR *name, const WCHAR *table_name ) { UINT r, n; MSIVIEW *table; @@ -423,14 +422,14 @@ static int select_count_columns( const column_info *col ) UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, const column_info *columns ) { - MSISELECTVIEW *sv = NULL; + struct select_view *sv = NULL; UINT count = 0, r = ERROR_SUCCESS; TRACE("%p\n", sv ); count = select_count_columns( columns ); - sv = calloc( 1, offsetof( MSISELECTVIEW, cols[count] ) ); + sv = calloc( 1, offsetof( struct select_view, cols[count] ) ); if( !sv ) return ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 6545f5dc63c..d67a16ab4a3 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -42,13 +42,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); * These apis are defined in MSI 3.0 */ -typedef struct tagMediaInfo +struct media_info { struct list entry; LPWSTR path; WCHAR szIndex[10]; DWORD index; -} media_info; +}; static UINT OpenSourceKey(LPCWSTR szProduct, HKEY* key, DWORD dwOptions, MSIINSTALLCONTEXT context, BOOL create) @@ -937,17 +937,16 @@ static void free_source_list(struct list *sourcelist) { while (!list_empty(sourcelist)) { - media_info *info = LIST_ENTRY(list_head(sourcelist), media_info, entry); + struct media_info *info = LIST_ENTRY(list_head(sourcelist), struct media_info, entry); list_remove(&info->entry); free(info->path); free(info); } } -static void add_source_to_list(struct list *sourcelist, media_info *info, - DWORD *index) +static void add_source_to_list(struct list *sourcelist, struct media_info *info, DWORD *index) { - media_info *iter; + struct media_info *iter; BOOL found = FALSE; if (index) *index = 0; @@ -958,7 +957,7 @@ static void add_source_to_list(struct list *sourcelist, media_info *info, return; } - LIST_FOR_EACH_ENTRY(iter, sourcelist, media_info, entry) + LIST_FOR_EACH_ENTRY(iter, sourcelist, struct media_info, entry) { if (!found && info->index < iter->index) { @@ -983,7 +982,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou DWORD index = 0; WCHAR name[10]; DWORD size, val_size; - media_info *entry; + struct media_info *entry; *count = 0; @@ -994,7 +993,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou if (r != ERROR_SUCCESS) return r; - entry = malloc(sizeof(media_info)); + entry = malloc(sizeof(*entry)); if (!entry) goto error; @@ -1037,7 +1036,7 @@ UINT WINAPI MsiSourceListAddSourceExW( const WCHAR *szProduct, const WCHAR *szUs HKEY sourcekey, typekey; UINT rc; struct list sourcelist; - media_info *info; + struct media_info *info; WCHAR *source, squashed_pc[SQUASHED_GUID_SIZE], name[10]; LPCWSTR postfix; DWORD size, count, index; @@ -1118,7 +1117,7 @@ UINT WINAPI MsiSourceListAddSourceExW( const WCHAR *szProduct, const WCHAR *szUs else { swprintf(name, ARRAY_SIZE(name), L"%d", dwIndex); - info = malloc(sizeof(media_info)); + info = malloc(sizeof(*info)); if (!info) { rc = ERROR_OUTOFMEMORY; @@ -1130,7 +1129,7 @@ UINT WINAPI MsiSourceListAddSourceExW( const WCHAR *szProduct, const WCHAR *szUs info->index = dwIndex; add_source_to_list(&sourcelist, info, &index); - LIST_FOR_EACH_ENTRY(info, &sourcelist, media_info, entry) + LIST_FOR_EACH_ENTRY(info, &sourcelist, struct media_info, entry) { if (info->index < index) continue; diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index df17aa036a5..94415035842 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -40,23 +40,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define NUM_STORAGES_COLS 2 #define MAX_STORAGES_NAME_LEN 62 -typedef struct tabSTORAGE +struct storage { UINT str_index; IStorage *storage; } STORAGE; -typedef struct tagMSISTORAGESVIEW +struct storages_view { MSIVIEW view; MSIDATABASE *db; - STORAGE *storages; + struct storage *storages; UINT max_storages; UINT num_rows; UINT row_size; -} MSISTORAGESVIEW; +}; -static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) +static BOOL storages_set_table_size(struct storages_view *sv, UINT size) { if (size >= sv->max_storages) { @@ -71,7 +71,7 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) static UINT STORAGES_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT *val) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; TRACE("(%p, %d, %d, %p)\n", view, row, col, val); @@ -88,7 +88,7 @@ static UINT STORAGES_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT STORAGES_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; TRACE("(%p, %d, %d, %p)\n", view, row, col, stm); @@ -155,7 +155,7 @@ done: static UINT STORAGES_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream ) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; IStorage *stg, *substg, *prev; const WCHAR *name; HRESULT hr; @@ -195,7 +195,7 @@ static UINT STORAGES_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *str static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; IStorage *stg, *substg = NULL, *prev; IStream *stm; LPWSTR name = NULL; @@ -259,7 +259,7 @@ done: static UINT STORAGES_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; if (!storages_set_table_size(sv, ++sv->num_rows)) return ERROR_FUNCTION_FAILED; @@ -294,7 +294,7 @@ static UINT STORAGES_close(struct tagMSIVIEW *view) static UINT STORAGES_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; TRACE("(%p, %p, %p)\n", view, rows, cols); @@ -330,7 +330,7 @@ static UINT STORAGES_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR * return ERROR_SUCCESS; } -static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row) +static UINT storages_find_row(struct storages_view *sv, MSIRECORD *rec, UINT *row) { LPCWSTR str; UINT r, i, id, data; @@ -356,7 +356,7 @@ static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row) static UINT storages_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; UINT r, row; r = storages_find_row(sv, rec, &row); @@ -368,7 +368,7 @@ static UINT storages_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) static UINT storages_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; UINT r, row; r = storages_find_row(sv, rec, &row); @@ -420,7 +420,7 @@ static UINT STORAGES_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIR static UINT STORAGES_delete(struct tagMSIVIEW *view) { - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + struct storages_view *sv = (struct storages_view *)view; UINT i; TRACE("(%p)\n", view); @@ -461,7 +461,7 @@ static const MSIVIEWOPS storages_ops = NULL, }; -static INT add_storages_to_table(MSISTORAGESVIEW *sv) +static INT add_storages_to_table(struct storages_view *sv) { IEnumSTATSTG *stgenum = NULL; STATSTG stat; @@ -514,12 +514,12 @@ static INT add_storages_to_table(MSISTORAGESVIEW *sv) UINT STORAGES_CreateView(MSIDATABASE *db, MSIVIEW **view) { - MSISTORAGESVIEW *sv; + struct storages_view *sv; INT rows; TRACE("(%p, %p)\n", db, view); - sv = calloc(1, sizeof(MSISTORAGESVIEW)); + sv = calloc(1, sizeof(*sv)); if (!sv) return ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index fb83e49db8b..4c23a97d10f 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -38,12 +38,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define NUM_STREAMS_COLS 2 -typedef struct tagMSISTREAMSVIEW +struct streams_view { MSIVIEW view; MSIDATABASE *db; UINT num_cols; -} MSISTREAMSVIEW; +}; static BOOL streams_resize_table( MSIDATABASE *db, UINT size ) { @@ -67,7 +67,7 @@ static BOOL streams_resize_table( MSIDATABASE *db, UINT size ) static UINT STREAMS_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT *val) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; TRACE("(%p, %d, %d, %p)\n", view, row, col, val); @@ -84,7 +84,7 @@ static UINT STREAMS_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT STREAMS_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; LARGE_INTEGER pos; HRESULT hr; @@ -112,7 +112,7 @@ static UINT STREAMS_set_string( struct tagMSIVIEW *view, UINT row, UINT col, con static UINT STREAMS_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream ) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; IStream *prev; TRACE("view %p, row %u, col %u, stream %p.\n", view, row, col, stream); @@ -125,7 +125,7 @@ static UINT STREAMS_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stre static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; TRACE("(%p, %d, %p, %08x)\n", view, row, rec, mask); @@ -162,7 +162,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U return ERROR_SUCCESS; } -static UINT streams_find_row( MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row ) +static UINT streams_find_row( struct streams_view *sv, MSIRECORD *rec, UINT *row ) { const WCHAR *str; UINT r, i, id, val; @@ -188,7 +188,7 @@ static UINT streams_find_row( MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row ) static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; UINT i, r, num_rows = sv->db->num_streams + 1; TRACE("(%p, %p, %d, %d)\n", view, rec, row, temporary); @@ -218,7 +218,7 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) { - MSIDATABASE *db = ((MSISTREAMSVIEW *)view)->db; + MSIDATABASE *db = ((struct streams_view *)view)->db; UINT i, num_rows = db->num_streams - 1; const WCHAR *name; WCHAR *encname; @@ -256,7 +256,7 @@ static UINT STREAMS_close(struct tagMSIVIEW *view) static UINT STREAMS_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; TRACE("(%p, %p, %p)\n", view, rows, cols); @@ -269,7 +269,7 @@ static UINT STREAMS_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *co static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -295,7 +295,7 @@ static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *n static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; UINT r, row; r = streams_find_row(sv, rec, &row); @@ -307,7 +307,7 @@ static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; UINT r; r = streams_find_row( sv, rec, NULL ); @@ -362,7 +362,7 @@ static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE static UINT STREAMS_delete(struct tagMSIVIEW *view) { - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + struct streams_view *sv = (struct streams_view *)view; TRACE("(%p)\n", view); @@ -538,7 +538,7 @@ UINT msi_get_stream( MSIDATABASE *db, const WCHAR *name, IStream **ret ) UINT STREAMS_CreateView(MSIDATABASE *db, MSIVIEW **view) { - MSISTREAMSVIEW *sv; + struct streams_view *sv; UINT r; TRACE("(%p, %p)\n", db, view); @@ -547,7 +547,7 @@ UINT STREAMS_CreateView(MSIDATABASE *db, MSIVIEW **view) if (r != ERROR_SUCCESS) return r; - if (!(sv = calloc( 1, sizeof(MSISTREAMSVIEW) ))) + if (!(sv = calloc( 1, sizeof(*sv) ))) return ERROR_OUTOFMEMORY; sv->view.ops = &streams_ops; diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 57ebca1807a..26da79ce8e1 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -44,30 +44,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); #include "pshpack1.h" -typedef struct { +struct property_set_header +{ WORD wByteOrder; WORD wFormat; DWORD dwOSVer; CLSID clsID; DWORD reserved; -} PROPERTYSETHEADER; +}; -typedef struct { +struct format_id_offset +{ FMTID fmtid; DWORD dwOffset; -} FORMATIDOFFSET; +}; -typedef struct { +struct property_section_header +{ DWORD cbSection; DWORD cProperties; -} PROPERTYSECTIONHEADER; +}; -typedef struct { +struct property_id_offset +{ DWORD propid; DWORD dwOffset; -} PROPERTYIDOFFSET; +}; -typedef struct { +struct property_data +{ DWORD type; union { INT i4; @@ -78,7 +83,7 @@ typedef struct { BYTE str[1]; } str; } u; -} PROPERTY_DATA; +}; #include "poppack.h" @@ -86,7 +91,7 @@ static HRESULT (WINAPI *pPropVariantChangeType) (PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); -#define SECT_HDR_SIZE (sizeof(PROPERTYSECTIONHEADER)) +#define SECT_HDR_SIZE (sizeof(struct property_section_header)) static void free_prop( PROPVARIANT *prop ) { @@ -170,14 +175,14 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz { UINT type; DWORD i, size; - PROPERTY_DATA *propdata; + struct property_data *propdata; PROPVARIANT property, *ptr; PROPVARIANT changed; - PROPERTYIDOFFSET *idofs; - PROPERTYSECTIONHEADER *section_hdr; + struct property_id_offset *idofs; + struct property_section_header *section_hdr; - section_hdr = (PROPERTYSECTIONHEADER*) &data[0]; - idofs = (PROPERTYIDOFFSET*) &data[SECT_HDR_SIZE]; + section_hdr = (struct property_section_header *) &data[0]; + idofs = (struct property_id_offset *)&data[SECT_HDR_SIZE]; /* now set all the properties */ for( i = 0; i < section_hdr->cProperties; i++ ) @@ -195,7 +200,7 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz break; } - propdata = (PROPERTY_DATA*) &data[ idofs[i].dwOffset ]; + propdata = (struct property_data *)&data[ idofs[i].dwOffset ]; /* check we don't run off the end of the data */ size = sz - idofs[i].dwOffset - sizeof(DWORD); @@ -237,9 +242,9 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm ) { - PROPERTYSETHEADER set_hdr; - FORMATIDOFFSET format_hdr; - PROPERTYSECTIONHEADER section_hdr; + struct property_set_header set_hdr; + struct format_id_offset format_hdr; + struct property_section_header section_hdr; LPBYTE data = NULL; LARGE_INTEGER ofs; ULONG count, sz; @@ -362,10 +367,10 @@ static UINT write_property_to_data( const PROPVARIANT *prop, LPBYTE data ) static UINT save_summary_info( const MSISUMMARYINFO * si, IStream *stm ) { UINT ret = ERROR_FUNCTION_FAILED; - PROPERTYSETHEADER set_hdr; - FORMATIDOFFSET format_hdr; - PROPERTYSECTIONHEADER section_hdr; - PROPERTYIDOFFSET idofs[MSI_MAX_PROPS]; + struct property_set_header set_hdr; + struct format_id_offset format_hdr; + struct property_section_header section_hdr; + struct property_id_offset idofs[MSI_MAX_PROPS]; LPBYTE data = NULL; ULONG count, sz; HRESULT r; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 5484f4da794..f65250766a4 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -40,22 +40,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSITABLE_HASH_TABLE_SIZE 37 -typedef struct tagMSICOLUMNHASHENTRY +struct column_hash_entry { - struct tagMSICOLUMNHASHENTRY *next; + struct column_hash_entry *next; UINT value; UINT row; -} MSICOLUMNHASHENTRY; +}; -typedef struct tagMSICOLUMNINFO +struct column_info { LPCWSTR tablename; UINT number; LPCWSTR colname; UINT type; UINT offset; - MSICOLUMNHASHENTRY **hash_table; -} MSICOLUMNINFO; + struct column_hash_entry **hash_table; +}; struct tagMSITABLE { @@ -63,7 +63,7 @@ struct tagMSITABLE BOOL *data_persistent; UINT row_count; struct list entry; - MSICOLUMNINFO *colinfo; + struct column_info *colinfo; UINT col_count; MSICONDITION persistent; LONG ref_count; @@ -71,20 +71,22 @@ struct tagMSITABLE }; /* information for default tables */ -static const MSICOLUMNINFO _Columns_cols[4] = { +static const struct column_info _Columns_cols[4] = +{ { L"_Columns", 1, L"Table", MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, NULL }, { L"_Columns", 2, L"Number", MSITYPE_VALID | MSITYPE_KEY | 2, 2, NULL }, { L"_Columns", 3, L"Name", MSITYPE_VALID | MSITYPE_STRING | 64, 4, NULL }, { L"_Columns", 4, L"Type", MSITYPE_VALID | 2, 6, NULL }, }; -static const MSICOLUMNINFO _Tables_cols[1] = { +static const struct column_info _Tables_cols[1] = +{ { L"_Tables", 1, L"Name", MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f -static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col, UINT bytes_per_strref ) +static inline UINT bytes_per_column( MSIDATABASE *db, const struct column_info *col, UINT bytes_per_strref ) { if( MSITYPE_IS_BINARY(col->type) ) return 2; @@ -353,7 +355,7 @@ end: return ret; } -static void free_colinfo( MSICOLUMNINFO *colinfo, UINT count ) +static void free_colinfo( struct column_info *colinfo, UINT count ) { UINT i; for (i = 0; i < count; i++) free( colinfo[i].hash_table ); @@ -371,9 +373,9 @@ static void free_table( MSITABLE *table ) free( table ); } -static UINT table_get_row_size( MSIDATABASE *db, const MSICOLUMNINFO *cols, UINT count, UINT bytes_per_strref ) +static UINT table_get_row_size( MSIDATABASE *db, const struct column_info *cols, UINT count, UINT bytes_per_strref ) { - const MSICOLUMNINFO *last_col; + const struct column_info *last_col; if (!count) return 0; @@ -489,7 +491,7 @@ static MSITABLE *find_cached_table( MSIDATABASE *db, LPCWSTR name ) return NULL; } -static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, DWORD count ) +static void table_calc_column_offsets( MSIDATABASE *db, struct column_info *colinfo, DWORD count ) { DWORD i; @@ -506,9 +508,9 @@ 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, struct column_info *colinfo, UINT *sz ) { - const MSICOLUMNINFO *p; + const struct column_info *p; DWORD i, n; TRACE("%s\n", debugstr_w(name)); @@ -535,12 +537,12 @@ 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 *, const WCHAR *, struct column_info *, UINT * ); -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, struct column_info **pcols, UINT *pcount ) { UINT r, column_count = 0; - MSICOLUMNINFO *columns; + struct column_info *columns; /* get the number of columns in this table */ column_count = 0; @@ -556,7 +558,7 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO TRACE("table %s found\n", debugstr_w(name)); - columns = malloc( column_count * sizeof(MSICOLUMNINFO) ); + columns = malloc( column_count * sizeof(*columns) ); if (!columns) return ERROR_FUNCTION_FAILED; @@ -626,7 +628,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, struct column_info *colinfo, UINT *sz ) { UINT r, i, n = 0, table_id, count, maxcount = *sz; MSITABLE *table = NULL; @@ -738,7 +740,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, for( col = col_info; col; col = col->next ) table->col_count++; - table->colinfo = malloc( table->col_count * sizeof(MSICOLUMNINFO) ); + table->colinfo = malloc( table->col_count * sizeof(*table->colinfo) ); if (!table->colinfo) { free_table( table ); @@ -991,20 +993,20 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) /* below is the query interface to a table */ -typedef struct tagMSITABLEVIEW +struct table_view { MSIVIEW view; MSIDATABASE *db; MSITABLE *table; - MSICOLUMNINFO *columns; + struct column_info *columns; UINT num_cols; UINT row_size; WCHAR name[1]; -} MSITABLEVIEW; +}; static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; UINT offset, n; if( !tv->table ) @@ -1039,7 +1041,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * return ERROR_SUCCESS; } -static UINT get_stream_name( const MSITABLEVIEW *tv, UINT row, WCHAR **pstname ) +static UINT get_stream_name( const struct table_view *tv, UINT row, WCHAR **pstname ) { LPWSTR p, stname = NULL; UINT i, r, type, ival; @@ -1131,7 +1133,7 @@ err: */ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; UINT r; WCHAR *name; @@ -1154,7 +1156,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt } /* Set a table value, i.e. preadjusted integer or string ID. */ -static UINT table_set_bytes( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) +static UINT table_set_bytes( struct table_view *tv, UINT row, UINT col, UINT val ) { UINT offset, n, i; @@ -1191,7 +1193,7 @@ static UINT table_set_bytes( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) return ERROR_SUCCESS; } -static UINT int_to_table_storage( const MSITABLEVIEW *tv, UINT col, int val, UINT *ret ) +static UINT int_to_table_storage( const struct table_view *tv, UINT col, int val, UINT *ret ) { if ((tv->columns[col-1].type & MSI_DATASIZEMASK) == 2) { @@ -1213,7 +1215,7 @@ static UINT int_to_table_storage( const MSITABLEVIEW *tv, UINT col, int val, UIN static UINT TABLE_set_int( MSIVIEW *view, UINT row, UINT col, int val ) { - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + struct table_view *tv = (struct table_view *)view; UINT r, table_int; TRACE("row %u, col %u, val %d.\n", row, col, val); @@ -1240,7 +1242,7 @@ static UINT TABLE_set_int( MSIVIEW *view, UINT row, UINT col, int val ) static UINT TABLE_set_string( MSIVIEW *view, UINT row, UINT col, const WCHAR *val, int len ) { - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + struct table_view *tv = (struct table_view *)view; BOOL persistent; UINT id, r; @@ -1277,7 +1279,7 @@ static UINT TABLE_set_string( MSIVIEW *view, UINT row, UINT col, const WCHAR *va static UINT TABLE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) { - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + struct table_view *tv = (struct table_view *)view; if (!tv->table) return ERROR_INVALID_PARAMETER; @@ -1339,7 +1341,7 @@ done: static UINT TABLE_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream ) { - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + struct table_view *tv = (struct table_view *)view; WCHAR *name; UINT r; @@ -1353,9 +1355,9 @@ static UINT TABLE_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream return r; } -static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT iField, UINT *pvalue ) +static UINT get_table_value_from_record( struct table_view *tv, MSIRECORD *rec, UINT iField, UINT *pvalue ) { - MSICOLUMNINFO columninfo; + struct column_info columninfo; UINT r; if (!iField || iField > tv->num_cols || MSI_RecordIsNull( rec, iField )) @@ -1387,7 +1389,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; UINT i, val, r = ERROR_SUCCESS; if ( !tv->table ) @@ -1472,7 +1474,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI static UINT table_create_new_row( struct tagMSIVIEW *view, UINT *num, BOOL temporary ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; BYTE **p, *row; BOOL *b; UINT sz; @@ -1531,7 +1533,7 @@ static UINT table_create_new_row( struct tagMSIVIEW *view, UINT *num, BOOL tempo static UINT TABLE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; TRACE("%p %p\n", tv, record); @@ -1549,7 +1551,7 @@ static UINT TABLE_close( struct tagMSIVIEW *view ) static UINT TABLE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; TRACE("%p %p %p\n", view, rows, cols ); @@ -1569,7 +1571,7 @@ static UINT TABLE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; TRACE("%p %d %p %p\n", tv, n, name, type ); @@ -1599,9 +1601,9 @@ static UINT TABLE_get_column_info( struct tagMSIVIEW *view, return ERROR_SUCCESS; } -static UINT table_find_row( MSITABLEVIEW *, MSIRECORD *, UINT *, UINT * ); +static UINT table_find_row( struct table_view *, MSIRECORD *, UINT *, UINT * ); -static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column ) +static UINT table_validate_new( struct table_view *tv, MSIRECORD *rec, UINT *column ) { UINT r, row, i; @@ -1645,7 +1647,7 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column ) return ERROR_SUCCESS; } -static int compare_record( MSITABLEVIEW *tv, UINT row, MSIRECORD *rec ) +static int compare_record( struct table_view *tv, UINT row, MSIRECORD *rec ) { UINT r, i, ivalue, x; @@ -1678,7 +1680,7 @@ static int compare_record( MSITABLEVIEW *tv, UINT row, MSIRECORD *rec ) return 1; } -static int find_insert_index( MSITABLEVIEW *tv, MSIRECORD *rec ) +static int find_insert_index( struct table_view *tv, MSIRECORD *rec ) { int idx, c, low = 0, high = tv->table->row_count - 1; @@ -1705,7 +1707,7 @@ static int find_insert_index( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; UINT i, r; TRACE("%p %p %s\n", tv, rec, temporary ? "TRUE" : "FALSE" ); @@ -1738,7 +1740,7 @@ static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; UINT r, num_rows, num_cols, i; TRACE("%p %d\n", tv, row); @@ -1776,7 +1778,7 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) static UINT table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) { - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + struct table_view *tv = (struct table_view *)view; UINT r, new_row; /* FIXME: MsiViewFetch should set rec index 0 to some ID that @@ -1802,7 +1804,7 @@ static UINT table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) static UINT table_assign(struct tagMSIVIEW *view, MSIRECORD *rec) { - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + struct table_view *tv = (struct table_view *)view; UINT r, row; if (!tv->table) @@ -1838,7 +1840,7 @@ static UINT refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row ) static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; UINT r, frow, column; TRACE("%p %d %p\n", view, eModifyMode, rec ); @@ -1912,7 +1914,7 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT TABLE_delete( struct tagMSIVIEW *view ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; TRACE("%p\n", view ); @@ -1926,7 +1928,7 @@ static UINT TABLE_delete( struct tagMSIVIEW *view ) static UINT TABLE_add_ref(struct tagMSIVIEW *view) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; TRACE( "%p, %ld\n", view, tv->table->ref_count ); return InterlockedIncrement(&tv->table->ref_count); @@ -1934,7 +1936,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) static UINT TABLE_remove_column(struct tagMSIVIEW *view, UINT number) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; MSIRECORD *rec = NULL; MSIVIEW *columns = NULL; UINT row, r; @@ -1967,7 +1969,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, UINT number) return r; } - r = table_find_row((MSITABLEVIEW *)columns, rec, &row, NULL); + r = table_find_row((struct table_view *)columns, rec, &row, NULL); if (r != ERROR_SUCCESS) goto done; @@ -1985,7 +1987,7 @@ done: static UINT TABLE_release(struct tagMSIVIEW *view) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; INT ref = tv->table->ref_count; UINT r; INT i; @@ -2025,8 +2027,8 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, { UINT i, r, table_id, col_id, size, offset; BOOL temporary = type & MSITYPE_TEMPORARY; - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - MSICOLUMNINFO *colinfo; + struct table_view *tv = (struct table_view *)view; + struct column_info *colinfo; if (temporary && !hold && !tv->table->ref_count) return ERROR_SUCCESS; @@ -2117,7 +2119,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, static UINT TABLE_drop(struct tagMSIVIEW *view) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; MSIVIEW *tables = NULL; MSIRECORD *rec = NULL; UINT r, row; @@ -2145,7 +2147,7 @@ static UINT TABLE_drop(struct tagMSIVIEW *view) return r; } - r = table_find_row((MSITABLEVIEW *)tables, rec, &row, NULL); + r = table_find_row((struct table_view *)tables, rec, &row, NULL); if (r != ERROR_SUCCESS) goto done; @@ -2188,7 +2190,7 @@ static const MSIVIEWOPS table_ops = UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) { - MSITABLEVIEW *tv ; + struct table_view *tv ; UINT r, sz; TRACE("%p %s %p\n", db, debugstr_w(name), view ); @@ -2198,7 +2200,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) else if ( !wcscmp( name, L"_Storages" ) ) return STORAGES_CreateView( db, view ); - sz = FIELD_OFFSET( MSITABLEVIEW, name[lstrlenW( name ) + 1] ); + sz = FIELD_OFFSET( struct table_view, name[lstrlenW( name ) + 1] ); tv = calloc( 1, sz ); if( !tv ) return ERROR_FUNCTION_FAILED; @@ -2228,7 +2230,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) return ERROR_SUCCESS; } -static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec) +static WCHAR *create_key_string(struct table_view *tv, MSIRECORD *rec) { DWORD i, p, len, key_len = 0; WCHAR *key; @@ -2260,7 +2262,7 @@ static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec) return key; } -static UINT record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, WCHAR *name, DWORD *len ) +static UINT record_stream_name( const struct table_view *tv, MSIRECORD *rec, WCHAR *name, DWORD *len ) { UINT p = 0, i, r; DWORD l; @@ -2295,7 +2297,7 @@ static UINT record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, WCHAR *n static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; if (!tv->table || col > tv->table->col_count) { @@ -2307,7 +2309,7 @@ static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *va static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; if (!tv->table || col > tv->table->col_count) { @@ -2322,7 +2324,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` (`new`, `Table`, `Column`, `Row`, `Data`, `Current`) VALUES (1, '"; - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; WCHAR buf[256], *query; MSIRECORD *old_rec; MSIQUERY *q; @@ -2463,7 +2465,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT return ERROR_SUCCESS; } -static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) +static UINT TransformView_create_table( struct table_view *tv, MSIRECORD *rec ) { static const WCHAR query_fmt[] = L"INSERT INTO `_TransformView` (`Table`, `Column`, `new`) VALUES ('%s', 'CREATE', 1)"; @@ -2498,7 +2500,7 @@ static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) return r; } -static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) +static UINT TransformView_add_column( struct table_view *tv, MSIRECORD *rec ) { static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '"; @@ -2557,7 +2559,7 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B static const WCHAR query_fmt[] = L"INSERT INTO `_TransformView` (`new`, `Table`, `Column`, `Row`) VALUES (1, '%s', 'INSERT', '%s')"; - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; WCHAR buf[256], *query = buf; MSIQUERY *q; WCHAR *key; @@ -2601,7 +2603,7 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B return TransformView_set_row( view, row, rec, ~0 ); } -static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) +static UINT TransformView_drop_table( struct table_view *tv, UINT row ) { static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `new`, `Table`, `Column` ) VALUES ( 1, '"; static const WCHAR query_sfx[] = L"', 'DROP' )"; @@ -2651,7 +2653,7 @@ static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) static const WCHAR query_column[] = L"', 'DELETE', '"; static const WCHAR query_sfx[] = L"')"; - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; WCHAR *key, buf[256], *query = buf; UINT r, len, name_len, key_len; MSIRECORD *rec; @@ -2734,7 +2736,7 @@ static UINT TransformView_get_column_info( MSIVIEW *view, UINT n, LPCWSTR *name, static UINT TransformView_delete( MSIVIEW *view ) { - MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + struct table_view *tv = (struct table_view *)view; if (!tv->table || tv->columns != tv->table->colinfo) free( tv->columns ); return TABLE_delete( view ); @@ -2770,8 +2772,8 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV WCHAR buf[256], *query = buf; UINT r, len, name_len, size, add_col; - MSICOLUMNINFO *colinfo; - MSITABLEVIEW *tv; + struct column_info *colinfo; + struct table_view *tv; MSIRECORD *rec; MSIQUERY *q; @@ -2781,7 +2783,7 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV if (r == ERROR_INVALID_PARAMETER) { /* table does not exist */ - size = FIELD_OFFSET( MSITABLEVIEW, name[name_len + 1] ); + size = FIELD_OFFSET( struct table_view, name[name_len + 1] ); tv = calloc( 1, size ); if (!tv) return ERROR_OUTOFMEMORY; @@ -2796,7 +2798,7 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV } else { - tv = (MSITABLEVIEW*)*view; + tv = (struct table_view *)*view; } tv->view.ops = &transform_view_ops; @@ -2946,7 +2948,7 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) return ret; } -static UINT record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, WCHAR **pstname ) +static UINT record_encoded_stream_name( const struct table_view *tv, MSIRECORD *rec, WCHAR **pstname ) { UINT r; DWORD len; @@ -2975,12 +2977,12 @@ static UINT record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, return ERROR_SUCCESS; } -static MSIRECORD *get_transform_record( const MSITABLEVIEW *tv, const string_table *st, IStorage *stg, +static MSIRECORD *get_transform_record( const struct table_view *tv, const string_table *st, IStorage *stg, const BYTE *rawdata, UINT bytes_per_strref ) { UINT i, val, ofs = 0; USHORT mask; - MSICOLUMNINFO *columns = tv->columns; + struct column_info *columns = tv->columns; MSIRECORD *rec; mask = rawdata[0] | (rawdata[1] << 8); @@ -3074,7 +3076,7 @@ static void dump_table( const string_table *st, const USHORT *rawdata, UINT raws } } -static UINT *record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) +static UINT *record_to_row( const struct table_view *tv, MSIRECORD *rec ) { UINT i, r, *data; @@ -3118,7 +3120,7 @@ static UINT *record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) return data; } -static UINT row_matches( MSITABLEVIEW *tv, UINT row, const UINT *data, UINT *column ) +static UINT row_matches( struct table_view *tv, UINT row, const UINT *data, UINT *column ) { UINT i, r, x, ret = ERROR_FUNCTION_FAILED; @@ -3147,7 +3149,7 @@ static UINT row_matches( MSITABLEVIEW *tv, UINT row, const UINT *data, UINT *col return ret; } -static UINT table_find_row( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *row, UINT *column ) +static UINT table_find_row( struct table_view *tv, MSIRECORD *rec, UINT *row, UINT *column ) { UINT i, r = ERROR_FUNCTION_FAILED, *data; @@ -3167,17 +3169,17 @@ static UINT table_find_row( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *row, UINT *c return r; } -typedef struct +struct transform_data { struct list entry; LPWSTR name; -} TRANSFORMDATA; +}; -static UINT table_load_transform( MSIDATABASE *db, IStorage *stg, string_table *st, TRANSFORMDATA *transform, +static UINT table_load_transform( MSIDATABASE *db, IStorage *stg, string_table *st, struct transform_data *transform, UINT bytes_per_strref, int err_cond ) { BYTE *rawdata = NULL; - MSITABLEVIEW *tv = NULL; + struct table_view *tv = NULL; UINT r, n, sz, i, mask, num_cols, colcol = 0, rawsize = 0; MSIRECORD *rec = NULL; WCHAR coltable[32]; @@ -3370,8 +3372,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) { struct list transforms; IEnumSTATSTG *stgenum = NULL; - TRANSFORMDATA *transform; - TRANSFORMDATA *tables = NULL, *columns = NULL; + struct transform_data *transform; + struct transform_data *tables = NULL, *columns = NULL; HRESULT hr; STATSTG stat; string_table *strings; @@ -3394,7 +3396,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) while ( TRUE ) { - MSITABLEVIEW *tv = NULL; + struct table_view *tv = NULL; WCHAR name[0x40]; ULONG count = 0; @@ -3411,7 +3413,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) !wcscmp( name+1, L"_StringData" ) ) continue; - transform = calloc( 1, sizeof(TRANSFORMDATA) ); + transform = calloc( 1, sizeof(*transform) ); if ( !transform ) break; @@ -3490,7 +3492,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) while ( !list_empty( &transforms ) ) { - transform = LIST_ENTRY( list_head( &transforms ), TRANSFORMDATA, entry ); + transform = LIST_ENTRY( list_head( &transforms ), struct transform_data, entry ); if ( wcscmp( transform->name, L"_Columns" ) && wcscmp( transform->name, L"_Tables" ) && @@ -3517,7 +3519,7 @@ end: msi_destroy_stringtable( strings ); if (transform_view) { - struct tagMSITABLE *table = ((MSITABLEVIEW*)transform_view)->table; + struct tagMSITABLE *table = ((struct table_view *)transform_view)->table; if (ret != ERROR_SUCCESS) transform_view->ops->release( transform_view ); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 3b9f98c6f17..22a905d0544 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -29,8 +29,8 @@ ** All the keywords of the SQL language are stored as in a hash ** table composed of instances of the following structure. */ -typedef struct Keyword Keyword; -struct Keyword { +struct keyword +{ const WCHAR *name; /* The keyword name */ unsigned int len; int tokenType; /* The token value for this keyword */ @@ -43,7 +43,7 @@ struct Keyword { ** They MUST be in alphabetical order */ #define X(str) str, ARRAY_SIZE(str) - 1 -static const Keyword aKeywordTable[] = { +static const struct keyword aKeywordTable[] = { { X(L"ADD"), TK_ADD }, { X(L"ALTER"), TK_ALTER }, { X(L"AND"), TK_AND }, @@ -88,7 +88,7 @@ static const Keyword aKeywordTable[] = { ** Comparison function for binary search. */ static int __cdecl compKeyword(const void *m1, const void *m2){ - const Keyword *k1 = m1, *k2 = m2; + const struct keyword *k1 = m1, *k2 = m2; int ret, len = min( k1->len, k2->len ); if ((ret = wcsnicmp( k1->name, k2->name, len ))) return ret; @@ -103,7 +103,7 @@ static int __cdecl compKeyword(const void *m1, const void *m2){ ** returned. If the input is not a keyword, TK_ID is returned. */ static int sqliteKeywordCode(const WCHAR *z, int n){ - Keyword key, *r; + struct keyword key, *r; if( n>MAX_TOKEN_LEN ) return TK_ID; @@ -111,7 +111,7 @@ static int sqliteKeywordCode(const WCHAR *z, int n){ key.tokenType = 0; key.name = z; key.len = n; - r = bsearch( &key, aKeywordTable, ARRAY_SIZE(aKeywordTable), sizeof(Keyword), compKeyword ); + r = bsearch( &key, aKeywordTable, ARRAY_SIZE(aKeywordTable), sizeof(struct keyword), compKeyword ); if( r ) return r->tokenType; return TK_ID; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 3fc5b2583bb..865455b1546 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -38,17 +38,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ -typedef struct tagMSIUPDATEVIEW +struct update_view { MSIVIEW view; MSIDATABASE *db; MSIVIEW *wv; column_info *vals; -} MSIUPDATEVIEW; +}; static UINT UPDATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; TRACE("%p %d %d %p\n", uv, row, col, val ); @@ -57,7 +57,7 @@ static UINT UPDATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT UPDATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; UINT i, r, col_count = 0, row_count = 0; MSIRECORD *values = NULL; MSIRECORD *where = NULL; @@ -128,7 +128,7 @@ done: static UINT UPDATE_close( struct tagMSIVIEW *view ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; MSIVIEW *wv; TRACE("%p\n", uv); @@ -142,7 +142,7 @@ static UINT UPDATE_close( struct tagMSIVIEW *view ) static UINT UPDATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; MSIVIEW *wv; TRACE("%p %p %p\n", uv, rows, cols ); @@ -157,7 +157,7 @@ static UINT UPDATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co static UINT UPDATE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; MSIVIEW *wv; TRACE("%p %d %p %p %p %p\n", uv, n, name, type, temporary, table_name ); @@ -172,7 +172,7 @@ static UINT UPDATE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na static UINT UPDATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; TRACE("%p %d %p\n", uv, eModifyMode, rec ); @@ -181,7 +181,7 @@ static UINT UPDATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT UPDATE_delete( struct tagMSIVIEW *view ) { - MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; + struct update_view *uv = (struct update_view *)view; MSIVIEW *wv; TRACE("%p\n", uv ); @@ -220,7 +220,7 @@ static const MSIVIEWOPS update_ops = UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, column_info *columns, struct expr *expr ) { - MSIUPDATEVIEW *uv = NULL; + struct update_view *uv = NULL; UINT r; MSIVIEW *sv = NULL, *wv = NULL; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 05be5338ac6..d2183d348d4 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -38,20 +38,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ -typedef struct tagMSIROWENTRY +struct row_entry { struct tagMSIWHEREVIEW *wv; /* used during sorting */ UINT values[1]; -} MSIROWENTRY; +}; -typedef struct tagJOINTABLE +struct join_table { - struct tagJOINTABLE *next; + struct join_table *next; MSIVIEW *view; UINT col_count; UINT row_count; UINT table_index; -} JOINTABLE; +}; typedef struct tagMSIORDERINFO { @@ -64,11 +64,11 @@ typedef struct tagMSIWHEREVIEW { MSIVIEW view; MSIDATABASE *db; - JOINTABLE *tables; + struct join_table *tables; UINT row_count; UINT col_count; UINT table_count; - MSIROWENTRY **reorder; + struct row_entry **reorder; UINT reorder_size; /* number of entries available in reorder */ struct expr *cond; UINT rec_index; @@ -100,7 +100,7 @@ static void free_reorder(MSIWHEREVIEW *wv) static UINT init_reorder(MSIWHEREVIEW *wv) { - MSIROWENTRY **new = calloc(INITIAL_REORDER_SIZE, sizeof(MSIROWENTRY *)); + struct row_entry **new = calloc(INITIAL_REORDER_SIZE, sizeof(*new)); if (!new) return ERROR_OUTOFMEMORY; @@ -124,11 +124,11 @@ static inline UINT find_row(MSIWHEREVIEW *wv, UINT row, UINT *(values[])) static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) { - MSIROWENTRY *new; + struct row_entry *new; if (wv->reorder_size <= wv->row_count) { - MSIROWENTRY **new_reorder; + struct row_entry **new_reorder; UINT newsize = wv->reorder_size * 2; new_reorder = realloc(wv->reorder, newsize * sizeof(*new_reorder)); @@ -140,7 +140,7 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) wv->reorder_size = newsize; } - new = malloc(offsetof(MSIROWENTRY, values[wv->table_count])); + new = malloc(offsetof(struct row_entry, values[wv->table_count])); if (!new) return ERROR_OUTOFMEMORY; @@ -153,9 +153,9 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) return ERROR_SUCCESS; } -static JOINTABLE *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) +static struct join_table *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) { - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; if(col == 0 || col > wv->col_count) return NULL; @@ -174,7 +174,7 @@ static JOINTABLE *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) static UINT parse_column(MSIWHEREVIEW *wv, union ext_column *column, UINT *column_type) { - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; UINT i, r; do @@ -216,7 +216,7 @@ static UINT parse_column(MSIWHEREVIEW *wv, union ext_column *column, static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table; + struct join_table *table; UINT *rows; UINT r; @@ -239,7 +239,7 @@ static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table; + struct join_table *table; UINT *rows; UINT r; @@ -262,7 +262,7 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt static UINT WHERE_set_int(struct tagMSIVIEW *view, UINT row, UINT col, int val) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table; + struct join_table *table; UINT *rows; UINT r; @@ -282,7 +282,7 @@ static UINT WHERE_set_int(struct tagMSIVIEW *view, UINT row, UINT col, int val) static UINT WHERE_set_string(struct tagMSIVIEW *view, UINT row, UINT col, const WCHAR *val, int len) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table; + struct join_table *table; UINT *rows; UINT r; @@ -302,7 +302,7 @@ static UINT WHERE_set_string(struct tagMSIVIEW *view, UINT row, UINT col, const static UINT WHERE_set_stream(MSIVIEW *view, UINT row, UINT col, IStream *stream) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table; + struct join_table *table; UINT *rows; UINT r; @@ -323,7 +323,7 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; UINT i, r, offset = 0; - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; UINT *rows; UINT mask_copy = mask; @@ -493,7 +493,7 @@ static INT INT_evaluate_binary( MSIWHEREVIEW *wv, const UINT rows[], static inline UINT expr_fetch_value(const union ext_column *expr, const UINT rows[], UINT *val) { - JOINTABLE *table = expr->parsed.table; + struct join_table *table = expr->parsed.table; if( rows[table->table_index] == INVALID_ROW_INDEX ) { @@ -647,7 +647,7 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const UINT rows[], return ERROR_SUCCESS; } -static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE **tables, +static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, struct join_table **tables, UINT table_rows[] ) { UINT r = ERROR_FUNCTION_FAILED; @@ -684,8 +684,8 @@ static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE **ta static int __cdecl compare_entry( const void *left, const void *right ) { - const MSIROWENTRY *le = *(const MSIROWENTRY**)left; - const MSIROWENTRY *re = *(const MSIROWENTRY**)right; + const struct row_entry *le = *(const struct row_entry **)left; + const struct row_entry *re = *(const struct row_entry **)right; const MSIWHEREVIEW *wv = le->wv; MSIORDERINFO *order = wv->order_info; UINT i, j, r, l_val, r_val; @@ -729,7 +729,7 @@ static int __cdecl compare_entry( const void *left, const void *right ) return 0; } -static void add_to_array( JOINTABLE **array, JOINTABLE *elem ) +static void add_to_array( struct join_table **array, struct join_table *elem ) { while (*array && *array != elem) array++; @@ -737,7 +737,7 @@ static void add_to_array( JOINTABLE **array, JOINTABLE *elem ) *array = elem; } -static BOOL in_array( JOINTABLE **array, JOINTABLE *elem ) +static BOOL in_array( struct join_table **array, struct join_table *elem ) { while (*array && *array != elem) array++; @@ -748,8 +748,8 @@ static BOOL in_array( JOINTABLE **array, JOINTABLE *elem ) #define JOIN_TO_CONST_EXPR 0x10000 /* comparison to a table involved with a CONST_EXPR comaprison */ -static UINT reorder_check( const struct expr *expr, JOINTABLE **ordered_tables, - BOOL process_joins, JOINTABLE **lastused ) +static UINT reorder_check( const struct expr *expr, struct join_table **ordered_tables, + BOOL process_joins, struct join_table **lastused ) { UINT res = 0; @@ -787,10 +787,9 @@ static UINT reorder_check( const struct expr *expr, JOINTABLE **ordered_tables, } /* reorders the tablelist in a way to evaluate the condition as fast as possible */ -static JOINTABLE **ordertables( MSIWHEREVIEW *wv ) +static struct join_table **ordertables( MSIWHEREVIEW *wv ) { - JOINTABLE *table; - JOINTABLE **tables; + struct join_table *table, **tables; tables = calloc(wv->table_count + 1, sizeof(*tables)); @@ -815,9 +814,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; UINT r; - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; UINT *rows; - JOINTABLE **ordered_tables; + struct join_table **ordered_tables; UINT i = 0; TRACE("%p %p\n", wv, record); @@ -857,7 +856,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (wv->order_info) wv->order_info->error = ERROR_SUCCESS; - qsort(wv->reorder, wv->row_count, sizeof(MSIROWENTRY *), compare_entry); + qsort(wv->reorder, wv->row_count, sizeof(struct row_entry *), compare_entry); if (wv->order_info) r = wv->order_info->error; @@ -870,7 +869,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) static UINT WHERE_close( struct tagMSIVIEW *view ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; TRACE("%p\n", wv ); @@ -910,7 +909,7 @@ static UINT WHERE_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *nam UINT *type, BOOL *temporary, LPCWSTR *table_name ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table; + struct join_table *table; TRACE("%p %d %p %p %p %p\n", wv, n, name, type, temporary, table_name ); @@ -980,7 +979,7 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; UINT r; TRACE("%p %d %p\n", wv, eModifyMode, rec); @@ -1035,13 +1034,13 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, static UINT WHERE_delete( struct tagMSIVIEW *view ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; TRACE("%p\n", wv ); while(table) { - JOINTABLE *next; + struct join_table *next; table->view->ops->delete(table->view); table->view = NULL; @@ -1066,7 +1065,7 @@ static UINT WHERE_delete( struct tagMSIVIEW *view ) static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns) { MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; - JOINTABLE *table = wv->tables; + struct join_table *table = wv->tables; column_info *column = columns; MSIORDERINFO *orderinfo; UINT r, count = 0; @@ -1245,12 +1244,12 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, while (*tables) { - JOINTABLE *table; + struct join_table *table; if ((ptr = wcschr(tables, ' '))) *ptr = '\0'; - table = malloc(sizeof(JOINTABLE)); + table = malloc(sizeof(*table)); if (!table) { r = ERROR_OUTOFMEMORY; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2096