From 2440dcfe88d1615b279ebe9e3a9a3b90203075e2 Mon Sep 17 00:00:00 2001 From: Stefan Huehner Date: Tue, 5 Jul 2005 12:49:14 +0000 Subject: [PATCH] Fix -Wmissing-declarations warnings. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplayx_global.c | 2 +- dlls/dplayx/name_server.c | 2 +- dlls/gdi/enhmetafile.c | 6 +++--- dlls/msvidc32/msvideo1.c | 6 +++--- dlls/netapi32/access.c | 10 +++++----- dlls/riched20/editor.c | 8 ++++---- dlls/rpcrt4/ndr_ole.c | 2 +- dlls/uxtheme/msstyles.c | 14 +++++++------- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1c523605cd0..608d9c1cc68 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3953,7 +3953,7 @@ static HRESULT WINAPI DirectPlay3WImpl_GetGroupConnectionSettings return DP_OK; } -BOOL CALLBACK DP_GetSpLpGuidFromCompoundAddress( +static BOOL CALLBACK DP_GetSpLpGuidFromCompoundAddress( REFGUID guidDataType, DWORD dwDataSize, LPCVOID lpData, diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index c372a12a7a2..5255f71f1b0 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -1061,7 +1061,7 @@ DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpConn ) -LPDPSESSIONDESC2 DPLAYX_CopyAndAllocateSessionDesc2A( LPCDPSESSIONDESC2 lpSessionSrc ) +static LPDPSESSIONDESC2 DPLAYX_CopyAndAllocateSessionDesc2A( LPCDPSESSIONDESC2 lpSessionSrc ) { LPDPSESSIONDESC2 lpSessionDest = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *lpSessionSrc ) ); diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 8d77838beb0..a9041e319e0 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -90,7 +90,7 @@ void NS_SetRemoteComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) lpCache->bNsIsLocal = FALSE; } -DPQ_DECL_COMPARECB( cbUglyPig, GUID ) +static DPQ_DECL_COMPARECB( cbUglyPig, GUID ) { return IsEqualGUID( elem1, elem2 ); } diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c index 16a7966ac32..ae4b81b4ab4 100644 --- a/dlls/gdi/enhmetafile.c +++ b/dlls/gdi/enhmetafile.c @@ -510,7 +510,7 @@ typedef struct enum_emh_data #define IS_WIN9X() (GetVersion()&0x80000000) -void EMF_Update_MF_Xform(HDC hdc, enum_emh_data *info) +static void EMF_Update_MF_Xform(HDC hdc, enum_emh_data *info) { XFORM mapping_mode_trans, final_trans; FLOAT scaleX, scaleY; @@ -533,7 +533,7 @@ void EMF_Update_MF_Xform(HDC hdc, enum_emh_data *info) } } -void EMF_SetMapMode(HDC hdc, enum_emh_data *info) +static void EMF_SetMapMode(HDC hdc, enum_emh_data *info) { INT horzSize = GetDeviceCaps( hdc, HORZSIZE ); INT vertSize = GetDeviceCaps( hdc, VERTSIZE ); @@ -2434,7 +2434,7 @@ typedef struct tagEMF_PaletteCopy * * NOTE: To be used by GetEnhMetaFilePaletteEntries only! */ -INT CALLBACK cbEnhPaletteCopy( HDC a, +static INT CALLBACK cbEnhPaletteCopy( HDC a, HANDLETABLE *b, const ENHMETARECORD *lpEMR, INT c, diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 4d5b832a7d3..9275c99bdb8 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -369,7 +369,7 @@ CRAM_DecompressGetFormat( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO o return size; } -LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) +static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) { TRACE("ICM_DECOMPRESS_BEGIN %p %p %p\n", info, in, out); @@ -390,7 +390,7 @@ LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPIN return ICERR_OK; } -LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) +static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height, stride, sz; WORD bit_per_pixel; @@ -422,7 +422,7 @@ LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) return ICERR_OK; } -LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD size ) +static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height, stride, sz; WORD bit_per_pixel; diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 458a1753a77..a9a0bf5b1c2 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -42,7 +42,7 @@ static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; * * Validates server name */ -NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) +static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) { if (ServerName) { @@ -66,7 +66,7 @@ NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) * * Checks whether the user name indicates current user. */ -BOOL NETAPI_IsKnownUser(LPCWSTR UserName) +static BOOL NETAPI_IsKnownUser(LPCWSTR UserName) { DWORD dwSize = UNLEN + 1; BOOL Result; @@ -275,7 +275,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, * * Creates a buffer with information for the Admin User */ -void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) +static void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) { static const WCHAR sAdminUserName[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r',0}; @@ -314,7 +314,7 @@ void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) * * Creates a buffer with information for the Guest User */ -void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) +static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) { static const WCHAR sGuestUserName[] = { 'G','u','e','s','t',0 }; @@ -353,7 +353,7 @@ void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) * NetQueryDisplayInformation (NETAPI32.@) * Copies NET_DISPLAY_USER record. */ -void ACCESS_CopyDisplayUser(PNET_DISPLAY_USER dest, LPWSTR *dest_buf, +static void ACCESS_CopyDisplayUser(PNET_DISPLAY_USER dest, LPWSTR *dest_buf, PNET_DISPLAY_USER src) { LPWSTR str = *dest_buf; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99ac957c5ef..e08da5ecb0a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -231,7 +231,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); int me_debug = 0; HANDLE me_heap = NULL; -ME_TextBuffer *ME_MakeText(void) { +static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -295,7 +295,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea return 0; } -void ME_RTFCharAttrHook(RTF_Info *info) +static void ME_RTFCharAttrHook(RTF_Info *info) { CHARFORMAT2W fmt; fmt.cbSize = sizeof(fmt); @@ -394,7 +394,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) /* FIXME this function doesn't get any information about context of the RTF tag, which is very bad, the same tags mean different things in different contexts */ -void ME_RTFParAttrHook(RTF_Info *info) +static void ME_RTFParAttrHook(RTF_Info *info) { PARAFORMAT2 fmt; fmt.cbSize = sizeof(fmt); @@ -459,7 +459,7 @@ void ME_RTFParAttrHook(RTF_Info *info) } } -void ME_RTFReadHook(RTF_Info *info) { +static void ME_RTFReadHook(RTF_Info *info) { switch(info->rtfClass) { case rtfGroup: diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index baa3f07338a..7a8cdb55b68 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -223,7 +223,7 @@ static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) return (LPSTREAM)This; } -const IID* get_ip_iid(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) +static const IID* get_ip_iid(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { const IID *riid; if (!pFormat) return &IID_IUnknown; diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c8bb90677cc..e1e20d6664c 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -253,7 +253,7 @@ PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) * * Retrieve the ini file for the selected color/style */ -PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) +static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) { static const WCHAR szFileResNamesResource[] = { 'F','I','L','E','R','E','S','N','A','M','E','S','\0' @@ -320,7 +320,7 @@ PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) * iPartId Location to store part id * iStateId Location to store state id */ -BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR szAppName, LPWSTR szClassName, int *iPartId, int *iStateId) +static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR szAppName, LPWSTR szClassName, int *iPartId, int *iStateId) { WCHAR sec[255]; WCHAR part[60] = {'\0'}; @@ -423,7 +423,7 @@ PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszC * RETURNS * The class added, or a class previously added with the same name */ -PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) +static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) { PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; @@ -480,7 +480,7 @@ PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iState * RETURNS * The part/state added, or a part/state previously added with the same IDs */ -PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateId) +static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateId) { PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; @@ -507,7 +507,7 @@ PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateI * RETURNS * The property found, or NULL */ -PTHEME_PROPERTY MSSTYLES_LFindProperty(PTHEME_PROPERTY tp, int iPropertyPrimitive, int iPropertyId) +static PTHEME_PROPERTY MSSTYLES_LFindProperty(PTHEME_PROPERTY tp, int iPropertyPrimitive, int iPropertyId) { PTHEME_PROPERTY cur = tp; while(cur) { @@ -596,7 +596,7 @@ PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) * RETURNS * The property added, or a property previously added with the same IDs */ -PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen, BOOL isGlobal) +static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen, BOOL isGlobal) { PTHEME_PROPERTY cur = MSSTYLES_PSFindProperty(ps, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */ @@ -637,7 +637,7 @@ PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive * RETURNS * The property added, or a property previously added with the same IDs */ -PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) +static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) { PTHEME_PROPERTY cur = MSSTYLES_FFindMetric(tf, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */