From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ole32/compobj_private.h | 76 ++++++++++++++++++------------------ dlls/ole32/dictionary.h | 14 +++---- dlls/ole32/moniker.h | 10 ++--- dlls/ole32/storage32.h | 30 +++++++------- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 34f5a8ec485..eae1a5998c0 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -66,15 +66,15 @@ struct oletls }; /* Global Interface Table Functions */ -extern void release_std_git(void) DECLSPEC_HIDDEN; -extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; +extern void release_std_git(void); +extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv); -HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; -HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN; -HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key); +HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); +HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv); /* Drag and drop */ -void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; +void OLEDD_UnInitialize(void); extern HRESULT WINAPI InternalTlsAllocData(struct oletls **tlsdata); @@ -97,49 +97,49 @@ static inline struct apartment * COM_CurrentApt(void) #define CHARS_IN_GUID 39 /* including NULL */ /* from dlldata.c */ -extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; -extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; -extern HRESULT WINAPI OLE32_DllRegisterServer(void) DECLSPEC_HIDDEN; -extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; +extern HINSTANCE hProxyDll; +extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); +extern HRESULT WINAPI OLE32_DllRegisterServer(void); +extern HRESULT WINAPI OLE32_DllUnregisterServer(void); -extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; -extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv); extern HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *pUnk, - REFIID riid, void **ppv) DECLSPEC_HIDDEN; -extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN; + REFIID riid, void **ppv); +extern IClassFactory GlobalOptionsCF; extern HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, - void **obj) DECLSPEC_HIDDEN; -extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; + void **obj); +extern IClassFactory GlobalInterfaceTableCF; extern HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, - void **obj) DECLSPEC_HIDDEN; -extern IClassFactory ManualResetEventCF DECLSPEC_HIDDEN; -extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; + void **obj); +extern IClassFactory ManualResetEventCF; +extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj); /* Exported non-interface Data Advise Holder functions */ -HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; -void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface) DECLSPEC_HIDDEN; +HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); +void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); -extern UINT ownerlink_clipboard_format DECLSPEC_HIDDEN; -extern UINT filename_clipboard_format DECLSPEC_HIDDEN; -extern UINT filenameW_clipboard_format DECLSPEC_HIDDEN; -extern UINT dataobject_clipboard_format DECLSPEC_HIDDEN; -extern UINT embedded_object_clipboard_format DECLSPEC_HIDDEN; -extern UINT embed_source_clipboard_format DECLSPEC_HIDDEN; -extern UINT custom_link_source_clipboard_format DECLSPEC_HIDDEN; -extern UINT link_source_clipboard_format DECLSPEC_HIDDEN; -extern UINT object_descriptor_clipboard_format DECLSPEC_HIDDEN; -extern UINT link_source_descriptor_clipboard_format DECLSPEC_HIDDEN; -extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN; +extern UINT ownerlink_clipboard_format; +extern UINT filename_clipboard_format; +extern UINT filenameW_clipboard_format; +extern UINT dataobject_clipboard_format; +extern UINT embedded_object_clipboard_format; +extern UINT embed_source_clipboard_format; +extern UINT custom_link_source_clipboard_format; +extern UINT link_source_clipboard_format; +extern UINT object_descriptor_clipboard_format; +extern UINT link_source_descriptor_clipboard_format; +extern UINT ole_private_data_clipboard_format; -void clipbrd_destroy(void) DECLSPEC_HIDDEN; +void clipbrd_destroy(void); -extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; -extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; +extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *); +extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *); -extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; +extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*); -extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; +extern const char *debugstr_formatetc(const FORMATETC *formatetc); static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) { @@ -154,6 +154,6 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) } extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, - BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; + BOOL copy, IEnumSTATDATA **ppenum); #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/dictionary.h b/dlls/ole32/dictionary.h index f3693ccc5c2..231a6474723 100644 --- a/dlls/ole32/dictionary.h +++ b/dlls/ole32/dictionary.h @@ -52,15 +52,15 @@ typedef BOOL (*enumeratefunc)(const void *k, const void *v, void *extra, * extra is passed to c (and d, if it's provided). * Assumes c is not NULL. */ -struct dictionary *dictionary_create(comparefunc c, destroyfunc d, void *extra) DECLSPEC_HIDDEN; +struct dictionary *dictionary_create(comparefunc c, destroyfunc d, void *extra); /* Assumes d is not NULL. */ -void dictionary_destroy(struct dictionary *d) DECLSPEC_HIDDEN; +void dictionary_destroy(struct dictionary *d); /* Returns how many entries have been stored in the dictionary. If two values * with the same key are inserted, only one is counted. */ -UINT dictionary_num_entries(struct dictionary *d) DECLSPEC_HIDDEN; +UINT dictionary_num_entries(struct dictionary *d); /* Sets an element with key k and value v to the dictionary. If a value * already exists with key k, its value is replaced, and the destroyfunc (if @@ -70,7 +70,7 @@ UINT dictionary_num_entries(struct dictionary *d) DECLSPEC_HIDDEN; * values for either the key or the value. * Assumes d is not NULL. */ -void dictionary_insert(struct dictionary *d, const void *k, const void *v) DECLSPEC_HIDDEN; +void dictionary_insert(struct dictionary *d, const void *k, const void *v); /* If a value with key k has been inserted into the dictionary, *v is set * to its associated value. Returns FALSE if the key is not found, and TRUE @@ -79,15 +79,15 @@ void dictionary_insert(struct dictionary *d, const void *k, const void *v) DECLS * value; see dictionary_insert.) * Assumes d and v are not NULL. */ -BOOL dictionary_find(struct dictionary *d, const void *k, void **v) DECLSPEC_HIDDEN; +BOOL dictionary_find(struct dictionary *d, const void *k, void **v); /* Removes the element with key k from the dictionary. Calls the destroyfunc * for the dictionary with the element if found (so you may destroy it if it's * dynamically allocated.) * Assumes d is not NULL. */ -void dictionary_remove(struct dictionary *d, const void *k) DECLSPEC_HIDDEN; +void dictionary_remove(struct dictionary *d, const void *k); -void dictionary_enumerate(struct dictionary *d, enumeratefunc e, void *closure) DECLSPEC_HIDDEN; +void dictionary_enumerate(struct dictionary *d, enumeratefunc e, void *closure); #endif /* ndef __DICTIONARY_H__ */ diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 2106e374394..94282b3fffc 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -41,13 +41,13 @@ HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUn HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, - LPDWORD pchEaten, LPMONIKER *ppmk) DECLSPEC_HIDDEN; + LPDWORD pchEaten, LPMONIKER *ppmk); HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, - LPDWORD pchEaten, LPMONIKER *ppmk) DECLSPEC_HIDDEN; + LPDWORD pchEaten, LPMONIKER *ppmk); -HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) DECLSPEC_HIDDEN; +HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer); -BOOL is_anti_moniker(IMoniker *iface, DWORD *order) DECLSPEC_HIDDEN; -HRESULT create_anti_moniker(DWORD order, IMoniker **ret) DECLSPEC_HIDDEN; +BOOL is_anti_moniker(IMoniker *iface, DWORD *order); +HRESULT create_anti_moniker(DWORD order, IMoniker **ret); #endif /* __WINE_MONIKER_H__ */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index f79f96e9293..dd4b89aceec 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -157,14 +157,14 @@ struct DirEntry ULARGE_INTEGER size; }; -HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes) DECLSPEC_HIDDEN; +HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes); /************************************************************************* * Ole Convert support */ -HRESULT STORAGE_CreateOleStream(IStorage*, DWORD) DECLSPEC_HIDDEN; -HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName) DECLSPEC_HIDDEN; +HRESULT STORAGE_CreateOleStream(IStorage*, DWORD); +HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName); enum swmr_mode { @@ -356,8 +356,8 @@ static inline HRESULT StorageBaseImpl_UnlockTransaction(StorageBaseImpl *This, B * StorageBaseImpl stream list handlers */ -void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm) DECLSPEC_HIDDEN; -void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm) DECLSPEC_HIDDEN; +void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm); +void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm); /* Number of BlockChainStream objects to cache in a StorageImpl */ #define BLOCKCHAIN_CACHE_SIZE 4 @@ -466,7 +466,7 @@ static inline StgStreamImpl *impl_from_IStream( IStream *iface ) StgStreamImpl* StgStreamImpl_Construct( StorageBaseImpl* parentStorage, DWORD grfMode, - DirRef dirEntry) DECLSPEC_HIDDEN; + DirRef dirEntry); /* Range lock constants. @@ -555,17 +555,17 @@ StgStreamImpl* StgStreamImpl_Construct( * are abstractions used to read values from file buffers without having to * worry about bit order */ -void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value) DECLSPEC_HIDDEN; -void StorageUtl_WriteWord(void *buffer, ULONG offset, WORD value) DECLSPEC_HIDDEN; -void StorageUtl_ReadDWord(const BYTE* buffer, ULONG offset, DWORD* value) DECLSPEC_HIDDEN; -void StorageUtl_WriteDWord(void *buffer, ULONG offset, DWORD value) DECLSPEC_HIDDEN; +void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value); +void StorageUtl_WriteWord(void *buffer, ULONG offset, WORD value); +void StorageUtl_ReadDWord(const BYTE* buffer, ULONG offset, DWORD* value); +void StorageUtl_WriteDWord(void *buffer, ULONG offset, DWORD value); void StorageUtl_ReadULargeInteger(const BYTE* buffer, ULONG offset, - ULARGE_INTEGER* value) DECLSPEC_HIDDEN; -void StorageUtl_WriteULargeInteger(void *buffer, ULONG offset, const ULARGE_INTEGER *value) DECLSPEC_HIDDEN; -void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value) DECLSPEC_HIDDEN; -void StorageUtl_WriteGUID(void *buffer, ULONG offset, const GUID* value) DECLSPEC_HIDDEN; + ULARGE_INTEGER* value); +void StorageUtl_WriteULargeInteger(void *buffer, ULONG offset, const ULARGE_INTEGER *value); +void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value); +void StorageUtl_WriteGUID(void *buffer, ULONG offset, const GUID* value); void StorageUtl_CopyDirEntryToSTATSTG(StorageBaseImpl *storage,STATSTG* destination, - const DirEntry* source, int statFlags) DECLSPEC_HIDDEN; + const DirEntry* source, int statFlags); #endif /* __STORAGE32_H__ */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3204