[PATCH 0/6] MR3261: Remove DECLSPEC_HIDDEN macro various dlls.
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_7/xaudio_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 8c07d4e9555..fc907edf9c1 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -104,15 +104,15 @@ typedef struct _IXAudio2Impl { } IXAudio2Impl; /* xaudio_dll.c */ -extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN; -extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) DECLSPEC_HIDDEN; -extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) DECLSPEC_HIDDEN; -extern DWORD WINAPI engine_thread(void *user) DECLSPEC_HIDDEN; +extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc); +extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain); +extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user); +extern DWORD WINAPI engine_thread(void *user); /* xapo.c */ -extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv); /* xaudio_allocator.c */ -extern void* XAudio_Internal_Malloc(size_t size) DECLSPEC_HIDDEN; -extern void XAudio_Internal_Free(void* ptr) DECLSPEC_HIDDEN; -extern void* XAudio_Internal_Realloc(void* ptr, size_t size) DECLSPEC_HIDDEN; +extern void* XAudio_Internal_Malloc(size_t size); +extern void XAudio_Internal_Free(void* ptr); +extern void* XAudio_Internal_Realloc(void* ptr, size_t size); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/dsound_private.h | 120 +++++++++++++++++------------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index e67d474d61d..80e6725fd27 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -34,7 +34,7 @@ #define DS_MAX_CHANNELS 6 -extern int ds_hel_buflen DECLSPEC_HIDDEN; +extern int ds_hel_buflen; /***************************************************************************** * Predeclare the interface implementation structures @@ -45,12 +45,12 @@ typedef struct DirectSoundDevice DirectSoundDevice; /* dsound_convert.h */ typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, BYTE *, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); -extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; -void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void mixieee32(float *src, float *dst, unsigned samples) DECLSPEC_HIDDEN; +extern const bitsgetfunc getbpp[5]; +void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void mixieee32(float *src, float *dst, unsigned samples); typedef void (*normfunc)(const void *, void *, unsigned); -extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; +extern const normfunc normfunctions[4]; typedef struct _DSVOLUMEPAN { @@ -119,8 +119,8 @@ typedef struct BufferMemory HRESULT DirectSoundDevice_AddBuffer( DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; -void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; + IDirectSoundBufferImpl * pDSB); +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB); /***************************************************************************** * IDirectSoundBuffer implementation structure @@ -176,75 +176,75 @@ struct IDirectSoundBufferImpl struct list entry; }; -float get_mono(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) DECLSPEC_HIDDEN; -void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +float get_mono(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel); +void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); +void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value); HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, - IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; + IDirectSoundBuffer **buffer); HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, - IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; -void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; -BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; -extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; -extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; -extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; + IDirectSoundBufferImpl *pdsb); +void secondarybuffer_destroy(IDirectSoundBufferImpl *This); +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This); +extern const IDirectSound3DListenerVtbl ds3dlvt; +extern const IDirectSound3DBufferVtbl ds3dbvt; +extern const IKsPropertySetVtbl iksbvt; -HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv); /******************************************************************************* */ /* dsound.c */ -HRESULT DSOUND_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; -HRESULT DSOUND_Create8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; -HRESULT IDirectSoundImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_ds8) DECLSPEC_HIDDEN; -void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) DECLSPEC_HIDDEN; +HRESULT DSOUND_Create(REFIID riid, void **ppv); +HRESULT DSOUND_Create8(REFIID riid, void **ppv); +HRESULT IDirectSoundImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_ds8); +void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device); /* primary.c */ -HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) DECLSPEC_HIDDEN; -HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) DECLSPEC_HIDDEN; -HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) DECLSPEC_HIDDEN; -LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; -HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; +HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device); +HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device); +HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device); +LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex); +HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave); HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, - const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; -void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; -HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; -LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; + const DSBUFFERDESC *dsbd); +void primarybuffer_destroy(IDirectSoundBufferImpl *This); +HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex); +LONG capped_refcount_dec(LONG *ref); /* duplex.c */ -HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv); /* mixer.c */ -void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN; -void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; -void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; -void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; -DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, float *overshot) DECLSPEC_HIDDEN; +void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len); +void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); +void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); +void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); +DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, float *overshot); -DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; +DWORD CALLBACK DSOUND_mixthread(void *ptr); /* sound3d.c */ -void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; +void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb); /* capture.c */ -HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN; -HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; -HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_dsc8) DECLSPEC_HIDDEN; +HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv); +HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv); +HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_dsc8); #define STATE_STOPPED 0 #define STATE_STARTING 1 @@ -252,21 +252,21 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** #define STATE_CAPTURING 2 #define STATE_STOPPING 3 -extern CRITICAL_SECTION DSOUND_renderers_lock DECLSPEC_HIDDEN; -extern CRITICAL_SECTION DSOUND_capturers_lock DECLSPEC_HIDDEN; -extern struct list DSOUND_capturers DECLSPEC_HIDDEN; -extern struct list DSOUND_renderers DECLSPEC_HIDDEN; +extern CRITICAL_SECTION DSOUND_renderers_lock; +extern CRITICAL_SECTION DSOUND_capturers_lock; +extern struct list DSOUND_capturers; +extern struct list DSOUND_renderers; -extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; -extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; +extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; +extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -extern const WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; +extern const WCHAR wine_vxd_drv[]; -void setup_dsound_options(void) DECLSPEC_HIDDEN; +void setup_dsound_options(void); -HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) DECLSPEC_HIDDEN; +HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device); BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, - DWORD depth, WORD channels) DECLSPEC_HIDDEN; + DWORD depth, WORD channels); HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, - LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN; + LPDSENUMCALLBACKW cb, void *user); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winmm/winemm.h | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 52cab64b1c5..0bae816c793 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -127,39 +127,39 @@ typedef struct tagWINE_MMIO { /* function prototypes */ -LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) DECLSPEC_HIDDEN; -BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz) DECLSPEC_HIDDEN; -LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2) DECLSPEC_HIDDEN; -void DRIVER_UnloadAll(void) DECLSPEC_HIDDEN; +LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr); +BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz); +LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2); +void DRIVER_UnloadAll(void); -void MMDRV_Exit(void) DECLSPEC_HIDDEN; -UINT MMDRV_GetNum(UINT) DECLSPEC_HIDDEN; +void MMDRV_Exit(void); +UINT MMDRV_GetNum(UINT); LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, - DWORD_PTR* dwCallback, DWORD_PTR* dwInstance) DECLSPEC_HIDDEN; -void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) DECLSPEC_HIDDEN; -DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2) DECLSPEC_HIDDEN; -DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg) DECLSPEC_HIDDEN; -LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID) DECLSPEC_HIDDEN; -DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; + DWORD_PTR* dwCallback, DWORD_PTR* dwInstance); +void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld); +DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2); +DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg); +LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID); +DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; +DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -const char* WINMM_ErrorToString(MMRESULT error) DECLSPEC_HIDDEN; +const char* WINMM_ErrorToString(MMRESULT error); -void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; +void TIME_MMTimeStop(void); -MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer); -void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; +void WINMM_DeleteWaveform(void); -void joystick_unload( void ) DECLSPEC_HIDDEN; +void joystick_unload( void ); /* Global variables */ -extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN; -extern HINSTANCE hWinMM32Instance DECLSPEC_HIDDEN; -extern HANDLE psLastEvent DECLSPEC_HIDDEN; -extern HANDLE psStopEvent DECLSPEC_HIDDEN; +extern CRITICAL_SECTION WINMM_cs; +extern HINSTANCE hWinMM32Instance; +extern HANDLE psLastEvent; +extern HANDLE psStopEvent; /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msi/msipriv.h | 552 ++++++++++++++++++++++----------------------- 1 file changed, 276 insertions(+), 276 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3a67fddc9c7..89495b5a6a5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -42,7 +42,7 @@ #include "winemsi.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -extern BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL is_wow64; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 @@ -751,225 +751,225 @@ typedef struct { } str; } awcstring; -UINT msi_strcpy_to_awstring(const WCHAR *, int, awstring *, DWORD *) DECLSPEC_HIDDEN; +UINT msi_strcpy_to_awstring(const WCHAR *, int, awstring *, DWORD *); /* msi server interface */ -extern MSIHANDLE msi_get_remote(MSIHANDLE handle) DECLSPEC_HIDDEN; -extern LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) DECLSPEC_HIDDEN; +extern MSIHANDLE msi_get_remote(MSIHANDLE handle); +extern LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr); /* handle functions */ -extern void *msihandle2msiinfo(MSIHANDLE handle, UINT type) DECLSPEC_HIDDEN; -extern MSIHANDLE alloc_msihandle( MSIOBJECTHDR * ) DECLSPEC_HIDDEN; -extern MSIHANDLE alloc_msi_remote_handle(MSIHANDLE remote) DECLSPEC_HIDDEN; -extern void *alloc_msiobject(UINT type, UINT size, msihandledestructor destroy ) DECLSPEC_HIDDEN; -extern void msiobj_addref(MSIOBJECTHDR *) DECLSPEC_HIDDEN; -extern int msiobj_release(MSIOBJECTHDR *) DECLSPEC_HIDDEN; -extern void msiobj_lock(MSIOBJECTHDR *) DECLSPEC_HIDDEN; -extern void msiobj_unlock(MSIOBJECTHDR *) DECLSPEC_HIDDEN; -extern void msi_free_handle_table(void) DECLSPEC_HIDDEN; +extern void *msihandle2msiinfo(MSIHANDLE handle, UINT type); +extern MSIHANDLE alloc_msihandle( MSIOBJECTHDR * ); +extern MSIHANDLE alloc_msi_remote_handle(MSIHANDLE remote); +extern void *alloc_msiobject(UINT type, UINT size, msihandledestructor destroy ); +extern void msiobj_addref(MSIOBJECTHDR *); +extern int msiobj_release(MSIOBJECTHDR *); +extern void msiobj_lock(MSIOBJECTHDR *); +extern void msiobj_unlock(MSIOBJECTHDR *); +extern void msi_free_handle_table(void); -extern void free_cached_tables( MSIDATABASE *db ) DECLSPEC_HIDDEN; -extern UINT MSI_CommitTables( MSIDATABASE *db ) DECLSPEC_HIDDEN; -extern UINT msi_commit_streams( MSIDATABASE *db ) DECLSPEC_HIDDEN; +extern void free_cached_tables( MSIDATABASE *db ); +extern UINT MSI_CommitTables( MSIDATABASE *db ); +extern UINT msi_commit_streams( MSIDATABASE *db ); /* string table functions */ -extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, BOOL persistent ) DECLSPEC_HIDDEN; -extern UINT msi_string2id( const string_table *st, const WCHAR *data, int len, UINT *id ) DECLSPEC_HIDDEN; -extern VOID msi_destroy_stringtable( string_table *st ) DECLSPEC_HIDDEN; -extern const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) DECLSPEC_HIDDEN; -extern HRESULT msi_init_string_table( IStorage *stg ) DECLSPEC_HIDDEN; -extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) DECLSPEC_HIDDEN; -extern UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *bytes_per_strref ) DECLSPEC_HIDDEN; -extern UINT msi_get_string_table_codepage( const string_table *st ) DECLSPEC_HIDDEN; -extern UINT msi_set_string_table_codepage( string_table *st, UINT codepage ) DECLSPEC_HIDDEN; -extern WCHAR *msi_strdupW( const WCHAR *value, int len ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; - -extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) DECLSPEC_HIDDEN; -extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) DECLSPEC_HIDDEN; +extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, BOOL persistent ); +extern UINT msi_string2id( const string_table *st, const WCHAR *data, int len, UINT *id ); +extern VOID msi_destroy_stringtable( string_table *st ); +extern const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ); +extern HRESULT msi_init_string_table( IStorage *stg ); +extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); +extern UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *bytes_per_strref ); +extern UINT msi_get_string_table_codepage( const string_table *st ); +extern UINT msi_set_string_table_codepage( string_table *st, UINT codepage ); +extern WCHAR *msi_strdupW( const WCHAR *value, int len ) __WINE_DEALLOC(free) __WINE_MALLOC; + +extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); +extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); extern UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, - BYTE **pdata, UINT *psz ) DECLSPEC_HIDDEN; + BYTE **pdata, UINT *psz ); extern UINT write_stream_data( IStorage *stg, LPCWSTR stname, - LPCVOID data, UINT sz, BOOL bTable ) DECLSPEC_HIDDEN; + LPCVOID data, UINT sz, BOOL bTable ); /* transform functions */ -extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) DECLSPEC_HIDDEN; +extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ); extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, - LPCWSTR szTransformFile, int iErrorCond ) DECLSPEC_HIDDEN; -extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) DECLSPEC_HIDDEN; -extern UINT msi_apply_transforms( MSIPACKAGE *package ) DECLSPEC_HIDDEN; + LPCWSTR szTransformFile, int iErrorCond ); +extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); +extern UINT msi_apply_transforms( MSIPACKAGE *package ); /* patch functions */ -extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) DECLSPEC_HIDDEN; -extern UINT msi_apply_patches( MSIPACKAGE *package ) DECLSPEC_HIDDEN; -extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) DECLSPEC_HIDDEN; -extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; -extern UINT msi_patch_assembly( MSIPACKAGE *, MSIASSEMBLY *, MSIFILEPATCH * ) DECLSPEC_HIDDEN; +extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ); +extern UINT msi_apply_patches( MSIPACKAGE *package ); +extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ); +extern void msi_free_patchinfo( MSIPATCHINFO *patch ); +extern UINT msi_patch_assembly( MSIPACKAGE *, MSIASSEMBLY *, MSIFILEPATCH * ); /* action internals */ -extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; -extern INT ACTION_ShowDialog( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; -extern INT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; -extern UINT ACTION_ForceReboot(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable ) DECLSPEC_HIDDEN; -extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ) DECLSPEC_HIDDEN; -extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) DECLSPEC_HIDDEN; -extern const WCHAR *msi_get_command_line_option( const WCHAR *cmd, const WCHAR *option, UINT *len ) DECLSPEC_HIDDEN; -extern UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) DECLSPEC_HIDDEN; -extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) DECLSPEC_HIDDEN; -extern INSTALLSTATE msi_get_feature_action( MSIPACKAGE *package, MSIFEATURE *feature ) DECLSPEC_HIDDEN; -extern UINT msi_load_all_components( MSIPACKAGE *package ) DECLSPEC_HIDDEN; -extern UINT msi_load_all_features( MSIPACKAGE *package ) DECLSPEC_HIDDEN; -extern UINT msi_validate_product_id( MSIPACKAGE *package ) DECLSPEC_HIDDEN; +extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); +extern INT ACTION_ShowDialog( MSIPACKAGE*, LPCWSTR); +extern INT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR); +extern UINT ACTION_ForceReboot(MSIPACKAGE *package); +extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable ); +extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ); +extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ); +extern const WCHAR *msi_get_command_line_option( const WCHAR *cmd, const WCHAR *option, UINT *len ); +extern UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ); +extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ); +extern INSTALLSTATE msi_get_feature_action( MSIPACKAGE *package, MSIFEATURE *feature ); +extern UINT msi_load_all_components( MSIPACKAGE *package ); +extern UINT msi_load_all_features( MSIPACKAGE *package ); +extern UINT msi_validate_product_id( MSIPACKAGE *package ); /* record internals */ -extern void MSI_CloseRecord( MSIOBJECTHDR * ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *) DECLSPEC_HIDDEN; -extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **) DECLSPEC_HIDDEN; -extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ) DECLSPEC_HIDDEN; -extern MSIRECORD *MSI_CreateRecord( UINT ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ) DECLSPEC_HIDDEN; -extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD) DECLSPEC_HIDDEN; -extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD) DECLSPEC_HIDDEN; -extern int MSI_RecordGetInteger( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *) DECLSPEC_HIDDEN; -extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, LPCWSTR ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ) DECLSPEC_HIDDEN; -extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ) DECLSPEC_HIDDEN; -extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ) DECLSPEC_HIDDEN; -extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DECLSPEC_HIDDEN; -extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPEC_HIDDEN; -extern const WCHAR *msi_record_get_string(const MSIRECORD *, UINT, int *) DECLSPEC_HIDDEN; -extern void dump_record(MSIRECORD *) DECLSPEC_HIDDEN; -extern UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) DECLSPEC_HIDDEN; -extern struct wire_record *marshal_record(MSIHANDLE handle) DECLSPEC_HIDDEN; -extern void free_remote_record(struct wire_record *rec) DECLSPEC_HIDDEN; -extern UINT copy_remote_record(const struct wire_record *rec, MSIHANDLE handle) DECLSPEC_HIDDEN; +extern void MSI_CloseRecord( MSIOBJECTHDR * ); +extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *); +extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **); +extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); +extern MSIRECORD *MSI_CreateRecord( UINT ); +extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ); +extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ); +extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ); +extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD); +extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); +extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); +extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); +extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); +extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); +extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ); +extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, LPCWSTR ); +extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ); +extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ); +extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ); +extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field); +extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int); +extern const WCHAR *msi_record_get_string(const MSIRECORD *, UINT, int *); +extern void dump_record(MSIRECORD *); +extern UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out); +extern struct wire_record *marshal_record(MSIHANDLE handle); +extern void free_remote_record(struct wire_record *rec); +extern UINT copy_remote_record(const struct wire_record *rec, MSIHANDLE handle); /* stream internals */ -extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; -extern WCHAR *encode_streamname(BOOL is_table, const WCHAR *in) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern BOOL decode_streamname(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; +extern void enum_stream_names( IStorage *stg ); +extern WCHAR *encode_streamname(BOOL is_table, const WCHAR *in) __WINE_DEALLOC(free) __WINE_MALLOC; +extern BOOL decode_streamname(LPCWSTR in, LPWSTR out); /* database internals */ -extern UINT msi_get_stream( MSIDATABASE *, const WCHAR *, IStream ** ) DECLSPEC_HIDDEN; -extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ) DECLSPEC_HIDDEN; -extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ) DECLSPEC_HIDDEN; -extern UINT WINAPIV MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ) DECLSPEC_HIDDEN; +extern UINT msi_get_stream( MSIDATABASE *, const WCHAR *, IStream ** ); +extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ); +extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ); +extern UINT WINAPIV MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ); typedef UINT (*record_func)( MSIRECORD *, LPVOID ); -extern UINT MSI_IterateRecords( MSIQUERY *, LPDWORD, record_func, LPVOID ) DECLSPEC_HIDDEN; -extern MSIRECORD * WINAPIV MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... ) DECLSPEC_HIDDEN; -extern UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *, LPCWSTR, MSIRECORD ** ) DECLSPEC_HIDDEN; +extern UINT MSI_IterateRecords( MSIQUERY *, LPDWORD, record_func, LPVOID ); +extern MSIRECORD * WINAPIV MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... ); +extern UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *, LPCWSTR, MSIRECORD ** ); /* view internals */ -extern UINT MSI_ViewExecute( MSIQUERY*, MSIRECORD * ) DECLSPEC_HIDDEN; -extern UINT MSI_ViewFetch( MSIQUERY*, MSIRECORD ** ) DECLSPEC_HIDDEN; -extern UINT MSI_ViewClose( MSIQUERY* ) DECLSPEC_HIDDEN; -extern UINT MSI_ViewGetColumnInfo(MSIQUERY *, MSICOLINFO, MSIRECORD **) DECLSPEC_HIDDEN; -extern UINT MSI_ViewModify( MSIQUERY *, MSIMODIFY, MSIRECORD * ) DECLSPEC_HIDDEN; -extern UINT VIEW_find_column( MSIVIEW *, LPCWSTR, LPCWSTR, UINT * ) DECLSPEC_HIDDEN; -extern UINT msi_view_get_row(MSIDATABASE *, MSIVIEW *, UINT, MSIRECORD **) DECLSPEC_HIDDEN; +extern UINT MSI_ViewExecute( MSIQUERY*, MSIRECORD * ); +extern UINT MSI_ViewFetch( MSIQUERY*, MSIRECORD ** ); +extern UINT MSI_ViewClose( MSIQUERY* ); +extern UINT MSI_ViewGetColumnInfo(MSIQUERY *, MSICOLINFO, MSIRECORD **); +extern UINT MSI_ViewModify( MSIQUERY *, MSIMODIFY, MSIRECORD * ); +extern UINT VIEW_find_column( MSIVIEW *, LPCWSTR, LPCWSTR, UINT * ); +extern UINT msi_view_get_row(MSIDATABASE *, MSIVIEW *, UINT, MSIRECORD **); /* install internals */ -extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) DECLSPEC_HIDDEN; +extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ); /* package internals */ #define WINE_OPENPACKAGEFLAGS_RECACHE 0x80000000 -extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ) DECLSPEC_HIDDEN; -extern UINT MSI_OpenPackageW( LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage ) DECLSPEC_HIDDEN; -extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; -extern INT MSI_ProcessMessageVerbatim( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLSPEC_HIDDEN; -extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLSPEC_HIDDEN; -extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ) DECLSPEC_HIDDEN; -extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ) DECLSPEC_HIDDEN; -extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ) DECLSPEC_HIDDEN; -extern UINT MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ) DECLSPEC_HIDDEN; -extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) DECLSPEC_HIDDEN; -extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR) DECLSPEC_HIDDEN; -extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR) DECLSPEC_HIDDEN; -extern UINT msi_clone_properties(MSIDATABASE *) DECLSPEC_HIDDEN; -extern UINT msi_set_context(MSIPACKAGE *) DECLSPEC_HIDDEN; -extern void msi_adjust_privilege_properties(MSIPACKAGE *) DECLSPEC_HIDDEN; -extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT) DECLSPEC_HIDDEN; +extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ); +extern UINT MSI_OpenPackageW( LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage ); +extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); +extern INT MSI_ProcessMessageVerbatim( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ); +extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ); +extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ); +extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); +extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); +extern UINT MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); +extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ); +extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); +extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); +extern UINT msi_clone_properties(MSIDATABASE *); +extern UINT msi_set_context(MSIPACKAGE *); +extern void msi_adjust_privilege_properties(MSIPACKAGE *); +extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT); /* for deformating */ -extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, LPDWORD ) DECLSPEC_HIDDEN; +extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, LPDWORD ); /* registry data encoding/decoding functions */ -extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; -extern BOOL squash_guid(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; -extern BOOL encode_base85_guid(GUID *,LPWSTR) DECLSPEC_HIDDEN; -extern BOOL decode_base85_guid(LPCWSTR,GUID*) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenUninstallKey(const WCHAR *, enum platform, HKEY *, BOOL) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUninstallKey(const WCHAR *, enum platform) DECLSPEC_HIDDEN; +extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out); +extern BOOL squash_guid(LPCWSTR in, LPWSTR out); +extern BOOL encode_base85_guid(GUID *,LPWSTR); +extern BOOL decode_base85_guid(LPCWSTR,GUID*); +extern UINT MSIREG_OpenUninstallKey(const WCHAR *, enum platform, HKEY *, BOOL); +extern UINT MSIREG_DeleteUninstallKey(const WCHAR *, enum platform); extern UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, - MSIINSTALLCONTEXT context, HKEY* key, BOOL create) DECLSPEC_HIDDEN; + MSIINSTALLCONTEXT context, HKEY* key, BOOL create); extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, - HKEY *key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) DECLSPEC_HIDDEN; + HKEY *key, BOOL create); +extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, - HKEY *key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) DECLSPEC_HIDDEN; + HKEY *key, BOOL create); +extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, - HKEY *key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) DECLSPEC_HIDDEN; + HKEY *key, BOOL create); +extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, - LPCWSTR szUserSid, HKEY *key, BOOL create) DECLSPEC_HIDDEN; + LPCWSTR szUserSid, HKEY *key, BOOL create); extern UINT MSIREG_OpenUserDataPatchKey(LPCWSTR szPatch, MSIINSTALLCONTEXT dwContext, - HKEY *key, BOOL create) DECLSPEC_HIDDEN; + HKEY *key, BOOL create); extern UINT MSIREG_OpenUserDataProductPatchesKey(LPCWSTR product, MSIINSTALLCONTEXT context, - HKEY *key, BOOL create) DECLSPEC_HIDDEN; + HKEY *key, BOOL create); extern UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, - LPCWSTR szUserSid, HKEY *key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserDataPatchKey(LPCWSTR patch, MSIINSTALLCONTEXT context) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUpgradeCodesKey(const WCHAR *) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; -extern UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) DECLSPEC_HIDDEN; -extern WCHAR *msi_reg_get_val_str( HKEY hkey, const WCHAR *name ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val) DECLSPEC_HIDDEN; - -extern DWORD msi_version_str_to_dword(LPCWSTR p) DECLSPEC_HIDDEN; -extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD) DECLSPEC_HIDDEN; -extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *) DECLSPEC_HIDDEN; -extern int msi_compare_font_versions(const WCHAR *, const WCHAR *) DECLSPEC_HIDDEN; - -extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) DECLSPEC_HIDDEN; -extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) DECLSPEC_HIDDEN; -extern LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ) DECLSPEC_HIDDEN; -extern LONG msi_reg_set_subkey_val( HKEY hkey, LPCWSTR path, LPCWSTR name, LPCWSTR val ) DECLSPEC_HIDDEN; + LPCWSTR szUserSid, HKEY *key, BOOL create); +extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct); +extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct); +extern UINT MSIREG_DeleteUserDataPatchKey(LPCWSTR patch, MSIINSTALLCONTEXT context); +extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT); +extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); +extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid); +extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode); +extern UINT MSIREG_DeleteUpgradeCodesKey(const WCHAR *); +extern UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode); +extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create); +extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode); +extern UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode); +extern UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context); +extern WCHAR *msi_reg_get_val_str( HKEY hkey, const WCHAR *name ) __WINE_DEALLOC(free) __WINE_MALLOC; +extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); + +extern DWORD msi_version_str_to_dword(LPCWSTR p); +extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); +extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); +extern int msi_compare_font_versions(const WCHAR *, const WCHAR *); + +extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); +extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); +extern LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ); +extern LONG msi_reg_set_subkey_val( HKEY hkey, LPCWSTR path, LPCWSTR name, LPCWSTR val ); /* msi dialog interface */ -extern void msi_dialog_check_messages( HANDLE ) DECLSPEC_HIDDEN; -extern void msi_dialog_destroy( msi_dialog* ) DECLSPEC_HIDDEN; -extern void msi_dialog_unregister_class( void ) DECLSPEC_HIDDEN; +extern void msi_dialog_check_messages( HANDLE ); +extern void msi_dialog_destroy( msi_dialog* ); +extern void msi_dialog_unregister_class( void ); /* summary information */ -extern UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; -extern UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; +extern UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **si ); +extern UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **si ); extern WCHAR *msi_suminfo_dup_string( MSISUMMARYINFO *si, - UINT property ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_suminfo_product( IStorage *stg ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; -extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN; -extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN; + UINT property ) __WINE_DEALLOC(free) __WINE_MALLOC; +extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ); +extern WCHAR *msi_get_suminfo_product( IStorage *stg ) __WINE_DEALLOC(free) __WINE_MALLOC; +extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ); +extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ); +extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ); /* undocumented functions */ UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD ); @@ -979,93 +979,93 @@ LANGID WINAPI MsiLoadStringW( MSIHANDLE, UINT, LPWSTR, int, LANGID ); LANGID WINAPI MsiLoadStringA( MSIHANDLE, UINT, LPSTR, int, LANGID ); /* UI globals */ -extern INSTALLUILEVEL gUILevel DECLSPEC_HIDDEN; -extern HWND gUIhwnd DECLSPEC_HIDDEN; -extern INSTALLUI_HANDLERA gUIHandlerA DECLSPEC_HIDDEN; -extern INSTALLUI_HANDLERW gUIHandlerW DECLSPEC_HIDDEN; -extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord DECLSPEC_HIDDEN; -extern DWORD gUIFilter DECLSPEC_HIDDEN; -extern DWORD gUIFilterRecord DECLSPEC_HIDDEN; -extern LPVOID gUIContext DECLSPEC_HIDDEN; -extern LPVOID gUIContextRecord DECLSPEC_HIDDEN; -extern WCHAR *gszLogFile DECLSPEC_HIDDEN; -extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; +extern INSTALLUILEVEL gUILevel; +extern HWND gUIhwnd; +extern INSTALLUI_HANDLERA gUIHandlerA; +extern INSTALLUI_HANDLERW gUIHandlerW; +extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord; +extern DWORD gUIFilter; +extern DWORD gUIFilterRecord; +extern LPVOID gUIContext; +extern LPVOID gUIContextRecord; +extern WCHAR *gszLogFile; +extern HINSTANCE msi_hInstance; /* action related functions */ -extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN; -extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN; -extern UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN; -extern void custom_stop_server(HANDLE process, HANDLE pipe) DECLSPEC_HIDDEN; +extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action); +extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); +extern UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action); +extern void custom_stop_server(HANDLE process, HANDLE pipe); /* actions in other modules */ -extern UINT ACTION_AppSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_CCPSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_FindRelatedProducts(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_InstallFiles(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_PatchFiles( MSIPACKAGE *package ) DECLSPEC_HIDDEN; -extern UINT ACTION_RemoveFiles(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_MoveFiles(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_DuplicateFiles(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_RemoveDuplicateFiles(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_RegisterFonts(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_UnregisterClassInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_UnregisterExtensionInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_UnregisterFonts(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_UnregisterMIMEInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_UnregisterProgIdInfo(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_MsiPublishAssemblies(MSIPACKAGE *package) DECLSPEC_HIDDEN; -extern UINT ACTION_MsiUnpublishAssemblies(MSIPACKAGE *package) DECLSPEC_HIDDEN; +extern UINT ACTION_AppSearch(MSIPACKAGE *package); +extern UINT ACTION_CCPSearch(MSIPACKAGE *package); +extern UINT ACTION_FindRelatedProducts(MSIPACKAGE *package); +extern UINT ACTION_InstallFiles(MSIPACKAGE *package); +extern UINT ACTION_PatchFiles( MSIPACKAGE *package ); +extern UINT ACTION_RemoveFiles(MSIPACKAGE *package); +extern UINT ACTION_MoveFiles(MSIPACKAGE *package); +extern UINT ACTION_DuplicateFiles(MSIPACKAGE *package); +extern UINT ACTION_RemoveDuplicateFiles(MSIPACKAGE *package); +extern UINT ACTION_RegisterClassInfo(MSIPACKAGE *package); +extern UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package); +extern UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package); +extern UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package); +extern UINT ACTION_RegisterFonts(MSIPACKAGE *package); +extern UINT ACTION_UnregisterClassInfo(MSIPACKAGE *package); +extern UINT ACTION_UnregisterExtensionInfo(MSIPACKAGE *package); +extern UINT ACTION_UnregisterFonts(MSIPACKAGE *package); +extern UINT ACTION_UnregisterMIMEInfo(MSIPACKAGE *package); +extern UINT ACTION_UnregisterProgIdInfo(MSIPACKAGE *package); +extern UINT ACTION_MsiPublishAssemblies(MSIPACKAGE *package); +extern UINT ACTION_MsiUnpublishAssemblies(MSIPACKAGE *package); /* Helpers */ -extern DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data ) DECLSPEC_HIDDEN; -extern WCHAR *msi_dup_record_field( MSIRECORD *row, INT index ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern WCHAR *msi_dup_property( MSIDATABASE *db, const WCHAR *prop ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern UINT msi_set_property( MSIDATABASE *, const WCHAR *, const WCHAR *, int ) DECLSPEC_HIDDEN; -extern UINT msi_get_property( MSIDATABASE *, LPCWSTR, LPWSTR, LPDWORD ) DECLSPEC_HIDDEN; -extern int msi_get_property_int( MSIDATABASE *package, LPCWSTR prop, int def ) DECLSPEC_HIDDEN; +extern DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data ); +extern WCHAR *msi_dup_record_field( MSIRECORD *row, INT index ) __WINE_DEALLOC(free) __WINE_MALLOC; +extern WCHAR *msi_dup_property( MSIDATABASE *db, const WCHAR *prop ) __WINE_DEALLOC(free) __WINE_MALLOC; +extern UINT msi_set_property( MSIDATABASE *, const WCHAR *, const WCHAR *, int ); +extern UINT msi_get_property( MSIDATABASE *, LPCWSTR, LPWSTR, LPDWORD ); +extern int msi_get_property_int( MSIDATABASE *package, LPCWSTR prop, int def ); extern WCHAR *msi_resolve_source_folder(MSIPACKAGE *package, const WCHAR *name, - MSIFOLDER **folder) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BOOL load_prop) DECLSPEC_HIDDEN; -extern WCHAR *msi_normalize_path(const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; + MSIFOLDER **folder) __WINE_DEALLOC(free) __WINE_MALLOC; +extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BOOL load_prop); +extern WCHAR *msi_normalize_path(const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, - MSIFILE *file) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; -extern void msi_reset_source_folders( MSIPACKAGE *package ) DECLSPEC_HIDDEN; -extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; -extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; -extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; -extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir) DECLSPEC_HIDDEN; -extern WCHAR *msi_create_temp_file(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern void msi_free_action_script(MSIPACKAGE *package, UINT script) DECLSPEC_HIDDEN; -extern WCHAR *msi_build_icon_path(MSIPACKAGE *, const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern WCHAR * WINAPIV msi_build_directory_name(DWORD , ...) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern void msi_reduce_to_long_filename(WCHAR *) DECLSPEC_HIDDEN; + MSIFILE *file) __WINE_DEALLOC(free) __WINE_MALLOC; +extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name); +extern void msi_reset_source_folders( MSIPACKAGE *package ); +extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component); +extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature); +extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file); +extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir); +extern WCHAR *msi_create_temp_file(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_MALLOC; +extern void msi_free_action_script(MSIPACKAGE *package, UINT script); +extern WCHAR *msi_build_icon_path(MSIPACKAGE *, const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC; +extern WCHAR * WINAPIV msi_build_directory_name(DWORD , ...) __WINE_DEALLOC(free) __WINE_MALLOC; +extern void msi_reduce_to_long_filename(WCHAR *); extern WCHAR *msi_create_component_advertise_string(MSIPACKAGE *, MSICOMPONENT *, - const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, MSIFEATURE *feature) DECLSPEC_HIDDEN; -extern UINT msi_register_unique_action(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; -extern BOOL msi_action_is_unique(const MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; + const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC; +extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, MSIFEATURE *feature); +extern UINT msi_register_unique_action(MSIPACKAGE *, const WCHAR *); +extern BOOL msi_action_is_unique(const MSIPACKAGE *, const WCHAR *); extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, - MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value) DECLSPEC_HIDDEN; -extern UINT msi_create_empty_local_file(LPWSTR path, LPCWSTR suffix) DECLSPEC_HIDDEN; -extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) DECLSPEC_HIDDEN; -extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; -extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; -extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; -extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; -extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; -extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_assembly_path(MSIPACKAGE *, const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; -extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_error_message(MSIDATABASE *, int) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; -extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; -extern UINT msi_strncpyW(const WCHAR *str, int len, WCHAR *buf, DWORD *sz) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_package_code(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; + MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); +extern UINT msi_create_empty_local_file(LPWSTR path, LPCWSTR suffix); +extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace); +extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *); +extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *); +extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *); +extern void msi_destroy_assembly_caches(MSIPACKAGE *); +extern BOOL msi_is_global_assembly(MSICOMPONENT *); +extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *); +extern WCHAR *msi_get_assembly_path(MSIPACKAGE *, const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC; +extern WCHAR **msi_split_string(const WCHAR *, WCHAR); +extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *); +extern WCHAR *msi_get_error_message(MSIDATABASE *, int) __WINE_DEALLOC(free) __WINE_MALLOC; +extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote); +extern UINT msi_strncpyW(const WCHAR *str, int len, WCHAR *buf, DWORD *sz); +extern WCHAR *msi_get_package_code(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_MALLOC; /* wrappers for filesystem functions */ static inline void msi_disable_fs_redirection( MSIPACKAGE *package ) @@ -1076,22 +1076,22 @@ static inline void msi_revert_fs_redirection( MSIPACKAGE *package ) { if (is_wow64 && package->platform == PLATFORM_X64) Wow64RevertWow64FsRedirection( package->cookie ); } -extern BOOL msi_get_temp_file_name( MSIPACKAGE *, const WCHAR *, const WCHAR *, WCHAR * ) DECLSPEC_HIDDEN; -extern HANDLE msi_create_file( MSIPACKAGE *, const WCHAR *, DWORD, DWORD, DWORD, DWORD ) DECLSPEC_HIDDEN; -extern BOOL msi_delete_file( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; -extern BOOL msi_remove_directory( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; -extern DWORD msi_get_file_attributes( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; -extern BOOL msi_set_file_attributes( MSIPACKAGE *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; -extern HANDLE msi_find_first_file( MSIPACKAGE *, const WCHAR *, WIN32_FIND_DATAW * ) DECLSPEC_HIDDEN; -extern BOOL msi_find_next_file( MSIPACKAGE *, HANDLE, WIN32_FIND_DATAW * ) DECLSPEC_HIDDEN; -extern BOOL msi_move_file( MSIPACKAGE *, const WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; -extern DWORD msi_get_file_version_info( MSIPACKAGE *, const WCHAR *, DWORD, BYTE * ) DECLSPEC_HIDDEN; -extern BOOL msi_create_full_path( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; -extern DWORD msi_get_disk_file_size( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; -extern VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; -extern UINT msi_get_filehash( MSIPACKAGE *, const WCHAR *, MSIFILEHASHINFO * ) DECLSPEC_HIDDEN; +extern BOOL msi_get_temp_file_name( MSIPACKAGE *, const WCHAR *, const WCHAR *, WCHAR * ); +extern HANDLE msi_create_file( MSIPACKAGE *, const WCHAR *, DWORD, DWORD, DWORD, DWORD ); +extern BOOL msi_delete_file( MSIPACKAGE *, const WCHAR * ); +extern BOOL msi_remove_directory( MSIPACKAGE *, const WCHAR * ); +extern DWORD msi_get_file_attributes( MSIPACKAGE *, const WCHAR * ); +extern BOOL msi_set_file_attributes( MSIPACKAGE *, const WCHAR *, DWORD ); +extern HANDLE msi_find_first_file( MSIPACKAGE *, const WCHAR *, WIN32_FIND_DATAW * ); +extern BOOL msi_find_next_file( MSIPACKAGE *, HANDLE, WIN32_FIND_DATAW * ); +extern BOOL msi_move_file( MSIPACKAGE *, const WCHAR *, const WCHAR *, DWORD ); +extern DWORD msi_get_file_version_info( MSIPACKAGE *, const WCHAR *, DWORD, BYTE * ); +extern BOOL msi_create_full_path( MSIPACKAGE *, const WCHAR * ); +extern DWORD msi_get_disk_file_size( MSIPACKAGE *, const WCHAR * ); +extern VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *, const WCHAR * ); +extern UINT msi_get_filehash( MSIPACKAGE *, const WCHAR *, MSIFILEHASHINFO * ); extern WCHAR *msi_get_font_file_version( MSIPACKAGE *, - const WCHAR * ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; + const WCHAR * ) __WINE_DEALLOC(free) __WINE_MALLOC; /* media */ @@ -1109,15 +1109,15 @@ typedef struct PVOID user; } MSICABDATA; -extern UINT ready_media(MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; -extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; -extern void msi_free_media_info(MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; -extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data) DECLSPEC_HIDDEN; -extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *) DECLSPEC_HIDDEN; +extern UINT ready_media(MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi); +extern void msi_free_media_info(MSIMEDIAINFO *mi); +extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); +extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *); /* control event stuff */ -extern void msi_event_fire(MSIPACKAGE *, const WCHAR *, MSIRECORD *) DECLSPEC_HIDDEN; -extern void msi_event_cleanup_all_subscriptions( MSIPACKAGE * ) DECLSPEC_HIDDEN; +extern void msi_event_fire(MSIPACKAGE *, const WCHAR *, MSIRECORD *); +extern void msi_event_cleanup_all_subscriptions( MSIPACKAGE * ); /* OLE automation */ typedef enum tid_t { @@ -1131,16 +1131,16 @@ typedef enum tid_t { LAST_tid } tid_t; -extern HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -extern HRESULT create_session(MSIHANDLE msiHandle, IDispatch *pInstaller, IDispatch **pDispatch) DECLSPEC_HIDDEN; -extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **ti) DECLSPEC_HIDDEN; -extern void release_typelib(void) DECLSPEC_HIDDEN; +extern HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj); +extern HRESULT create_session(MSIHANDLE msiHandle, IDispatch *pInstaller, IDispatch **pDispatch); +extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **ti); +extern void release_typelib(void); /* Scripting */ -extern DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function, LPCWSTR action) DECLSPEC_HIDDEN; +extern DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function, LPCWSTR action); /* User interface messages from the actions */ -extern void msi_ui_progress(MSIPACKAGE *, int, int, int, int) DECLSPEC_HIDDEN; +extern void msi_ui_progress(MSIPACKAGE *, int, int, int, int); static inline char *strdupWtoA( LPCWSTR str ) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/advapi32_misc.h | 12 ++++++------ dlls/advapi32/crypt.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 65bd8aa8529..c7ef2e4794e 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -25,13 +25,13 @@ #include "winnls.h" #include "wine/heap.h" -const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; -BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; -BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; +const char * debugstr_sid(PSID sid); +BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName); +BOOL ADVAPI_GetComputerSid(PSID sid); -BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; -BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; -const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; +BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +const WCHAR *get_wellknown_privilege_name(const LUID *); /* memory allocation functions */ diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index a4429642d24..4484b4799e5 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -87,9 +87,9 @@ typedef struct tagCRYPTHASH #define MAXPROVTYPES 999 extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ) DECLSPEC_HIDDEN; + const unsigned char *src ); extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ) DECLSPEC_HIDDEN; + const unsigned char *src ); struct ustring { DWORD Length; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 13201cc7178..feeade7def6 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -131,11 +131,11 @@ extern int dinput_device_object_index_from_id( IDirectInputDevice8W *iface, DWOR extern BOOL device_object_matches_semantic( const DIDEVICEINSTANCEW *instance, const DIOBJECTDATAFORMAT *object, DWORD semantic, BOOL exact ); -extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; -extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; -extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; -extern void queue_event( IDirectInputDevice8W *iface, int index, DWORD data, DWORD time, DWORD seq ) DECLSPEC_HIDDEN; +extern BOOL get_app_key(HKEY*, HKEY*); +extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ); +extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ); +extern void queue_event( IDirectInputDevice8W *iface, int index, DWORD data, DWORD time, DWORD seq ); -extern const GUID dinput_pidvid_guid DECLSPEC_HIDDEN; +extern const GUID dinput_pidvid_guid; #endif /* __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3261
participants (4)
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (＠alesliehughes)
-
Hans Leidekker (＠hans)
-
Rémi Bernon