Skip to content

W
wine-cw
Commit 383302c1 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Make functions static.

parent 162adc42
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 53 deletions
dlls/iccvid/iccvid.c
View file @ 383302c1
......@@ -331,7 +331,7 @@ int x, y;
* Call this function once at the start of the sequence and save the
* returned context for calls to decode_cinepak().
*/
cinepak_info *decode_cinepak_init(void)
static cinepak_info *decode_cinepak_init(void)
{
cinepak_info *cvinfo;
int i;
......@@ -351,7 +351,7 @@ cinepak_info *decode_cinepak_init(void)
return cvinfo;
}
void free_cvinfo( cinepak_info *cvinfo )
static void free_cvinfo( cinepak_info *cvinfo )
{
unsigned int i;
......@@ -381,7 +381,7 @@ typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, int stride,
* bit_per_pixel - the number of bits per pixel allocated to the output
* frame (only 24 or 32 bpp are supported)
*/
void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size,
static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size,
unsigned char *frame, unsigned int width, unsigned int height, int bit_per_pixel)
{
cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL;
......@@ -752,7 +752,7 @@ static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLOR
return FALSE;
}
LRESULT ICCVID_DecompressQuery( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
static LRESULT ICCVID_DecompressQuery( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
{
TRACE("ICM_DECOMPRESS_QUERY %p %p %p\n", info, in, out);
......@@ -802,7 +802,7 @@ LRESULT ICCVID_DecompressQuery( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO
return ICERR_OK;
}
LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
static LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
{
DWORD size;
......@@ -826,7 +826,7 @@ LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAP
return size;
}
LRESULT ICCVID_DecompressBegin( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
static LRESULT ICCVID_DecompressBegin( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
{
TRACE("ICM_DECOMPRESS_BEGIN %p %p %p\n", info, in, out);
......@@ -862,7 +862,7 @@ LRESULT ICCVID_DecompressBegin( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO
return ICERR_OK;
}
LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size )
static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size )
{
LONG width, height;
......@@ -880,7 +880,7 @@ LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size )
return ICERR_OK;
}
LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWORD size )
static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWORD size )
{
LONG width, height;
......@@ -900,7 +900,7 @@ LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWORD size
return ICERR_OK;
}
LRESULT ICCVID_Close( ICCVID_Info *info )
static LRESULT ICCVID_Close( ICCVID_Info *info )
{
if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
return 0;
......
dlls/itss/storage.c
View file @ 383302c1
......@@ -263,7 +263,7 @@ static IEnumSTATSTG_Impl *ITSS_create_enum( void )
/************************************************************************/
HRESULT WINAPI ITSS_IStorageImpl_QueryInterface(
static HRESULT WINAPI ITSS_IStorageImpl_QueryInterface(
IStorage* iface,
REFIID riid,
void** ppvObject)
......@@ -282,14 +282,14 @@ HRESULT WINAPI ITSS_IStorageImpl_QueryInterface(
return E_NOINTERFACE;
}
ULONG WINAPI ITSS_IStorageImpl_AddRef(
static ULONG WINAPI ITSS_IStorageImpl_AddRef(
IStorage* iface)
{
ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface;
return InterlockedIncrement(&This->ref);
}
ULONG WINAPI ITSS_IStorageImpl_Release(
static ULONG WINAPI ITSS_IStorageImpl_Release(
IStorage* iface)
{
ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface;
......@@ -305,7 +305,7 @@ ULONG WINAPI ITSS_IStorageImpl_Release(
return ref;
}
HRESULT WINAPI ITSS_IStorageImpl_CreateStream(
static HRESULT WINAPI ITSS_IStorageImpl_CreateStream(
IStorage* iface,
LPCOLESTR pwcsName,
DWORD grfMode,
......@@ -317,7 +317,7 @@ HRESULT WINAPI ITSS_IStorageImpl_CreateStream(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_OpenStream(
static HRESULT WINAPI ITSS_IStorageImpl_OpenStream(
IStorage* iface,
LPCOLESTR pwcsName,
void* reserved1,
......@@ -363,7 +363,7 @@ HRESULT WINAPI ITSS_IStorageImpl_OpenStream(
return S_OK;
}
HRESULT WINAPI ITSS_IStorageImpl_CreateStorage(
static HRESULT WINAPI ITSS_IStorageImpl_CreateStorage(
IStorage* iface,
LPCOLESTR pwcsName,
DWORD grfMode,
......@@ -375,7 +375,7 @@ HRESULT WINAPI ITSS_IStorageImpl_CreateStorage(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
IStorage* iface,
LPCOLESTR pwcsName,
IStorage* pstgPriority,
......@@ -391,7 +391,7 @@ HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_CopyTo(
static HRESULT WINAPI ITSS_IStorageImpl_CopyTo(
IStorage* iface,
DWORD ciidExclude,
const IID* rgiidExclude,
......@@ -402,7 +402,7 @@ HRESULT WINAPI ITSS_IStorageImpl_CopyTo(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_MoveElementTo(
static HRESULT WINAPI ITSS_IStorageImpl_MoveElementTo(
IStorage* iface,
LPCOLESTR pwcsName,
IStorage* pstgDest,
......@@ -413,7 +413,7 @@ HRESULT WINAPI ITSS_IStorageImpl_MoveElementTo(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_Commit(
static HRESULT WINAPI ITSS_IStorageImpl_Commit(
IStorage* iface,
DWORD grfCommitFlags)
{
......@@ -421,7 +421,7 @@ HRESULT WINAPI ITSS_IStorageImpl_Commit(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_Revert(
static HRESULT WINAPI ITSS_IStorageImpl_Revert(
IStorage* iface)
{
FIXME("\n");
......@@ -452,7 +452,7 @@ static int ITSS_chm_enumerator(
return CHM_ENUMERATOR_CONTINUE;
}
HRESULT WINAPI ITSS_IStorageImpl_EnumElements(
static HRESULT WINAPI ITSS_IStorageImpl_EnumElements(
IStorage* iface,
DWORD reserved1,
void* reserved2,
......@@ -481,7 +481,7 @@ HRESULT WINAPI ITSS_IStorageImpl_EnumElements(
return S_OK;
}
HRESULT WINAPI ITSS_IStorageImpl_DestroyElement(
static HRESULT WINAPI ITSS_IStorageImpl_DestroyElement(
IStorage* iface,
LPCOLESTR pwcsName)
{
......@@ -489,7 +489,7 @@ HRESULT WINAPI ITSS_IStorageImpl_DestroyElement(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_RenameElement(
static HRESULT WINAPI ITSS_IStorageImpl_RenameElement(
IStorage* iface,
LPCOLESTR pwcsOldName,
LPCOLESTR pwcsNewName)
......@@ -498,7 +498,7 @@ HRESULT WINAPI ITSS_IStorageImpl_RenameElement(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_SetElementTimes(
static HRESULT WINAPI ITSS_IStorageImpl_SetElementTimes(
IStorage* iface,
LPCOLESTR pwcsName,
const FILETIME* pctime,
......@@ -509,7 +509,7 @@ HRESULT WINAPI ITSS_IStorageImpl_SetElementTimes(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_SetClass(
static HRESULT WINAPI ITSS_IStorageImpl_SetClass(
IStorage* iface,
REFCLSID clsid)
{
......@@ -517,7 +517,7 @@ HRESULT WINAPI ITSS_IStorageImpl_SetClass(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_SetStateBits(
static HRESULT WINAPI ITSS_IStorageImpl_SetStateBits(
IStorage* iface,
DWORD grfStateBits,
DWORD grfMask)
......@@ -526,7 +526,7 @@ HRESULT WINAPI ITSS_IStorageImpl_SetStateBits(
return E_NOTIMPL;
}
HRESULT WINAPI ITSS_IStorageImpl_Stat(
static HRESULT WINAPI ITSS_IStorageImpl_Stat(
IStorage* iface,
STATSTG* pstatstg,
DWORD grfStatFlag)
......
dlls/shell32/shlmenu.c
View file @ 383302c1
......@@ -75,8 +75,9 @@ static BOOL bAbortInit;
WINE_DEFAULT_DEBUG_CHANNEL(shell);
LPFMINFO FM_GetMenuInfo(HMENU hmenu)
{ MENUINFO MenuInfo;
static LPFMINFO FM_GetMenuInfo(HMENU hmenu)
{
MENUINFO MenuInfo;
LPFMINFO menudata;
MenuInfo.cbSize = sizeof(MENUINFO);
......@@ -410,6 +411,7 @@ BOOL WINAPI FileMenu_AppendItemAW(
return ret;
}
/*************************************************************************
* FileMenu_InsertUsingPidl [SHELL32.110]
*
......@@ -828,16 +830,16 @@ void WINAPI FileMenu_AbortInitMenu (void)
* or NULL at failure.
*/
LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x)
{ FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n",
{
FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n",
hMenu,hWndParent,w,x);
return NULL; /* this is supposed to be a pointer */
}
/*************************************************************************
* Shell_MergeMenus [SHELL32.67]
*
* _SHIsMenuSeparator (internal)
*/
BOOL _SHIsMenuSeparator(HMENU hm, int i)
static BOOL _SHIsMenuSeparator(HMENU hm, int i)
{
MENUITEMINFOW mii;
......@@ -857,8 +859,9 @@ BOOL _SHIsMenuSeparator(HMENU hm, int i)
return(FALSE);
}
/**********************************************************************/
/*************************************************************************
* Shell_MergeMenus [SHELL32.67]
*/
HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags)
{ int nItem;
HMENU hmSubMenu;
......
dlls/shell32/systray.c
View file @ 383302c1
......@@ -157,7 +157,7 @@ static LRESULT CALLBACK SYSTRAY_WndProc(HWND hWnd, UINT message, WPARAM wParam,
}
BOOL SYSTRAY_RegisterClass(void)
static BOOL SYSTRAY_RegisterClass(void)
{
WNDCLASSA wc;
......@@ -180,7 +180,7 @@ BOOL SYSTRAY_RegisterClass(void)
}
BOOL SYSTRAY_ItemInit(SystrayItem *ptrayItem)
static BOOL SYSTRAY_ItemInit(SystrayItem *ptrayItem)
{
RECT rect;
......@@ -237,13 +237,13 @@ static void SYSTRAY_ItemTerm(SystrayItem *ptrayItem)
}
void SYSTRAY_ItemSetMessage(SystrayItem *ptrayItem, UINT uCallbackMessage)
static void SYSTRAY_ItemSetMessage(SystrayItem *ptrayItem, UINT uCallbackMessage)
{
ptrayItem->notifyIcon.uCallbackMessage = uCallbackMessage;
}
void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HICON hIcon)
static void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HICON hIcon)
{
if(ptrayItem->notifyIcon.hIcon)
DestroyIcon(ptrayItem->notifyIcon.hIcon);
......@@ -252,7 +252,7 @@ void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HICON hIcon)
}
void SYSTRAY_ItemSetTip(SystrayItem *ptrayItem, CHAR* szTip, int modify)
static void SYSTRAY_ItemSetTip(SystrayItem *ptrayItem, CHAR* szTip, int modify)
{
TTTOOLINFOA ti;
......
dlls/shell32/tests/shlfileop.c
View file @ 383302c1
......@@ -44,7 +44,7 @@ static void InitFunctionPointers(void)
}
/* creates a file with the specified name for tests */
void createTestFile(const CHAR *name)
static void createTestFile(const CHAR *name)
{
HANDLE file;
DWORD written;
......@@ -56,13 +56,13 @@ void createTestFile(const CHAR *name)
CloseHandle(file);
}
BOOL file_exists(const CHAR *name)
static BOOL file_exists(const CHAR *name)
{
return GetFileAttributesA(name) != INVALID_FILE_ATTRIBUTES;
}
/* initializes the tests */
void init_shfo_tests(void)
static void init_shfo_tests(void)
{
GetCurrentDirectoryA(MAX_PATH, CURR_DIR);
createTestFile(".\\test1.txt");
......@@ -73,7 +73,7 @@ void init_shfo_tests(void)
}
/* cleans after tests */
void clean_after_shfo_tests(void)
static void clean_after_shfo_tests(void)
{
DeleteFileA(".\\test1.txt");
DeleteFileA(".\\test2.txt");
......@@ -95,7 +95,7 @@ void clean_after_shfo_tests(void)
files - string with file names, separated by null characters. Ends on a double
null characters
*/
void set_curr_dir_path(CHAR *buf, const CHAR* files)
static void set_curr_dir_path(CHAR *buf, const CHAR* files)
{
buf[0] = 0;
while (files[0])
......@@ -113,7 +113,7 @@ void set_curr_dir_path(CHAR *buf, const CHAR* files)
/* tests the FO_DELETE action */
void test_delete(void)
static void test_delete(void)
{
SHFILEOPSTRUCTA shfo;
DWORD ret;
......@@ -162,7 +162,7 @@ void test_delete(void)
}
/* tests the FO_RENAME action */
void test_rename()
static void test_rename(void)
{
SHFILEOPSTRUCTA shfo, shfo2;
CHAR from[MAX_PATH];
......@@ -231,7 +231,7 @@ void test_rename()
}
/* tests the FO_COPY action */
void test_copy(void)
static void test_copy(void)
{
SHFILEOPSTRUCTA shfo, shfo2;
CHAR from[MAX_PATH];
......@@ -327,7 +327,7 @@ void test_copy(void)
}
/* tests the FO_MOVE action */
void test_move(void)
static void test_move(void)
{
SHFILEOPSTRUCTA shfo, shfo2;
CHAR from[MAX_PATH];
......@@ -411,7 +411,7 @@ void test_move(void)
ok(!SHFileOperationA(&shfo), "Move dir back\n");
}
void test_sh_create_dir()
static void test_sh_create_dir(void)
{
CHAR path[MAX_PATH];
int ret;
......
dlls/winmm/tests/timer.c
View file @ 383302c1
......@@ -142,7 +142,7 @@ static void test_timer(UINT period, UINT resolution)
dwMin, dwMax, sum / (count - 1), sqrt(deviation / (count - 2)));
}
const char * get_priority(int priority)
static const char * get_priority(int priority)
{
static char tmp[32];
#define STR(x) case x: return #x
......@@ -162,14 +162,14 @@ const char * get_priority(int priority)
static int priority = 0;
static BOOL fired = FALSE;
void CALLBACK priorityTimeProc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
static void CALLBACK priorityTimeProc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
{
priority = GetThreadPriority(GetCurrentThread());
ok(priority!=THREAD_PRIORITY_ERROR_RETURN, "GetThreadPriority() failed, GetLastError() = %08lx\n", GetLastError());
fired = TRUE;
}
void test_priority(void)
static void test_priority(void)
{
UINT id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment