Francois Gouget : ole32: Remove WINAPI on static functions where not needed .
Alexandre Julliard
julliard at winehq.org
Wed Nov 26 07:32:29 CST 2008
Module: wine
Branch: master
Commit: 66063ae4a4d86a0c019fbecb3a7b95c362fc379f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=66063ae4a4d86a0c019fbecb3a7b95c362fc379f
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Nov 25 16:41:41 2008 +0100
ole32: Remove WINAPI on static functions where not needed.
---
dlls/ole32/classmoniker.c | 4 ++--
dlls/ole32/compobj.c | 2 +-
dlls/ole32/errorinfo.c | 4 ++--
dlls/ole32/filemoniker.c | 9 ++++-----
dlls/ole32/itemmoniker.c | 8 ++++----
dlls/ole32/moniker.c | 6 +++---
dlls/ole32/stg_bigblockfile.c | 4 ++--
7 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c
index 5c95b0a..5629c5a 100644
--- a/dlls/ole32/classmoniker.c
+++ b/dlls/ole32/classmoniker.c
@@ -116,7 +116,7 @@ static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface)
/******************************************************************************
* ClassMoniker_Destroy (local function)
*******************************************************************************/
-static HRESULT WINAPI ClassMoniker_Destroy(ClassMoniker* This)
+static HRESULT ClassMoniker_Destroy(ClassMoniker* This)
{
TRACE("(%p)\n",This);
@@ -693,7 +693,7 @@ static const IROTDataVtbl ROTDataVtbl =
/******************************************************************************
* ClassMoniker_Construct (local function)
*******************************************************************************/
-static HRESULT WINAPI ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid)
+static HRESULT ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid)
{
TRACE("(%p,%s)\n",This,debugstr_guid(rclsid));
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 37907ec..bc03914 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -1267,7 +1267,7 @@ HRESULT WINAPI CoCreateGuid(GUID *pguid)
* SEE ALSO
* StringFromCLSID
*/
-static HRESULT WINAPI __CLSIDFromString(LPCWSTR s, CLSID *id)
+static HRESULT __CLSIDFromString(LPCWSTR s, CLSID *id)
{
int i;
BYTE table[256];
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index e4a1c47..0009ebe 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -42,7 +42,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole);
/* this code is from SysAllocStringLen (ole2disp.c in oleaut32) */
-static BSTR WINAPI ERRORINFO_SysAllocString(const OLECHAR* in)
+static BSTR ERRORINFO_SysAllocString(const OLECHAR* in)
{
DWORD bufferSize;
DWORD* newBuffer;
@@ -99,7 +99,7 @@ static BSTR WINAPI ERRORINFO_SysAllocString(const OLECHAR* in)
}
/* this code is from SysFreeString (ole2disp.c in oleaut32)*/
-static VOID WINAPI ERRORINFO_SysFreeString(BSTR in)
+static VOID ERRORINFO_SysFreeString(BSTR in)
{
DWORD* bufferPointer;
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 3dae139..0da643f 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -63,8 +63,8 @@ static inline IMoniker *impl_from_IROTData( IROTData *iface )
}
/* Local function used by filemoniker implementation */
-static HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName);
-static HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface);
+static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName);
+static HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* iface);
/*******************************************************************************
* FileMoniker_QueryInterface
@@ -456,7 +456,7 @@ FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize)
/******************************************************************************
* FileMoniker_Destroy (local function)
*******************************************************************************/
-HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* This)
+HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* This)
{
TRACE("(%p)\n",This);
@@ -1333,8 +1333,7 @@ static const IROTDataVtbl VT_ROTDataImpl =
/******************************************************************************
* FileMoniker_Construct (local function)
*/
-static HRESULT WINAPI
-FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPathName)
+static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPathName)
{
int nb=0,i;
int sizeStr=lstrlenW(lpszPathName);
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index 1a8822a..08b1fe4 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -97,8 +97,8 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx*
static HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys);
/* Local function used by ItemMoniker implementation */
-static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszPathName);
-static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* iface);
+static HRESULT ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszPathName);
+static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* iface);
/********************************************************************************/
/* IROTData prototype functions */
@@ -391,7 +391,7 @@ HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface,
/******************************************************************************
* ItemMoniker_Construct (local function)
*******************************************************************************/
-static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem)
+static HRESULT ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem)
{
int sizeStr1=lstrlenW(lpszItem), sizeStr2;
@@ -429,7 +429,7 @@ static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR
/******************************************************************************
* ItemMoniker_Destroy (local function)
*******************************************************************************/
-static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* This)
+static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* This)
{
TRACE("(%p)\n",This);
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 4e56462..c5b5c2f 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -93,7 +93,7 @@ typedef struct EnumMonikerImpl
/* IEnumMoniker Local functions*/
-static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list,
+static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list,
ULONG pos, IEnumMoniker **ppenumMoniker);
static IrotHandle get_irot_handle(void)
@@ -342,7 +342,7 @@ RunningObjectTableImpl_AddRef(IRunningObjectTable* iface)
/***********************************************************************
* RunningObjectTable_Initialize
*/
-static HRESULT WINAPI
+static HRESULT
RunningObjectTableImpl_Destroy(void)
{
struct list *cursor, *cursor2;
@@ -1463,7 +1463,7 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl =
* Used by EnumRunning to create the structure and EnumClone
* to copy the structure
*/
-static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list,
+static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list,
ULONG current_pos,
IEnumMoniker **ppenumMoniker)
{
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index b0e54e5..a2ee1de 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -725,7 +725,7 @@ static DWORD BIGBLOCKFILE_GetProtectMode(DWORD openFlags)
*
* See the documentation of ILockBytes for more info.
*/
-static HRESULT WINAPI ImplBIGBLOCKFILE_ReadAt(
+static HRESULT ImplBIGBLOCKFILE_ReadAt(
BigBlockFile* const This,
ULARGE_INTEGER ulOffset, /* [in] */
void* pv, /* [length_is][size_is][out] */
@@ -812,7 +812,7 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_ReadAt(
*
* See the documentation of ILockBytes for more info.
*/
-static HRESULT WINAPI ImplBIGBLOCKFILE_WriteAt(
+static HRESULT ImplBIGBLOCKFILE_WriteAt(
BigBlockFile* const This,
ULARGE_INTEGER ulOffset, /* [in] */
const void* pv, /* [size_is][in] */
More information about the wine-cvs
mailing list