Mark several functions as static.

dlls/browseui/tests/autocomplete.c

@@ -66,12 +66,12 @@ typedef struct
 extern IEnumStringVtbl TestACLVtbl;
 extern IACListVtbl TestACL_ACListVtbl;
 
-TestACL *impl_from_IACList(IACList *iface)
+static TestACL *impl_from_IACList(IACList *iface)
 {
     return (TestACL *)((char *)iface - FIELD_OFFSET(TestACL, aclVtbl));
 }
 
-TestACL *TestACL_Constructor(int limit, const char **strings)
+static TestACL *TestACL_Constructor(int limit, const char **strings)
 {
     TestACL *This = CoTaskMemAlloc(sizeof(TestACL));
     ZeroMemory(This, sizeof(*This));
@@ -222,7 +222,7 @@ IACListVtbl TestACL_ACListVtbl =
 #define expect_end(obj) \
     ok(obj->lpVtbl->Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n");
 
-void test_ACLMulti(void)
+static void test_ACLMulti(void)
 {
     const char *strings1[] = {"a", "c", "e"};
     const char *strings2[] = {"a", "b", "d"};

dlls/comctl32/tests/datetime.c

@@ -203,7 +203,7 @@ static void test_dtm_set_format(HWND hWndDateTime)
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
 }
 
-void test_mccolor_types(HWND hWndDateTime, int mccolor_type, const char* mccolor_name)
+static void test_mccolor_types(HWND hWndDateTime, int mccolor_type, const char* mccolor_name)
 {
     LRESULT r;
     COLORREF theColor, prevColor;
@@ -262,7 +262,7 @@ static void test_dtm_get_monthcal(HWND hWndDateTime)
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
 }
 
-void fill_systime_struct(SYSTEMTIME *st, int year, int month, int dayofweek, int day, int hour, int minute, int second, int milliseconds)
+static void fill_systime_struct(SYSTEMTIME *st, int year, int month, int dayofweek, int day, int hour, int minute, int second, int milliseconds)
 {
     st->wYear = year;
     st->wMonth = month;
@@ -274,7 +274,7 @@ void fill_systime_struct(SYSTEMTIME *st, int year, int month, int dayofweek, int
     st->wMilliseconds = milliseconds;
 }
 
-LPARAM compare_systime_date(SYSTEMTIME *st1, SYSTEMTIME *st2)
+static LPARAM compare_systime_date(SYSTEMTIME *st1, SYSTEMTIME *st2)
 {
     return (st1->wYear == st2->wYear)
             && (st1->wMonth == st2->wMonth)
@@ -282,7 +282,7 @@ LPARAM compare_systime_date(SYSTEMTIME *st1, SYSTEMTIME *st2)
             && (st1->wDay == st2->wDay);
 }
 
-LPARAM compare_systime_time(SYSTEMTIME *st1, SYSTEMTIME *st2)
+static LPARAM compare_systime_time(SYSTEMTIME *st1, SYSTEMTIME *st2)
 {
     return (st1->wHour == st2->wHour)
             && (st1->wMinute == st2->wMinute)
@@ -290,7 +290,7 @@ LPARAM compare_systime_time(SYSTEMTIME *st1, SYSTEMTIME *st2)
             && (st1->wMilliseconds == st2->wMilliseconds);
 }
 
-LPARAM compare_systime(SYSTEMTIME *st1, SYSTEMTIME *st2)
+static LPARAM compare_systime(SYSTEMTIME *st1, SYSTEMTIME *st2)
 {
     if(!compare_systime_date(st1, st2))
         return 0;

dlls/kernel32/tests/resource.c

@@ -161,7 +161,7 @@ static void update_resources_delete( void )
     ok( r, "EndUpdateResouce failed\n");
 }
 
-void update_resources_version(void)
+static void update_resources_version(void)
 {
     HANDLE res = NULL;
     BOOL r;
@@ -191,7 +191,7 @@ void update_resources_version(void)
 
 typedef void (*res_check_func)( IMAGE_RESOURCE_DIRECTORY* );
 
-void check_empty( IMAGE_RESOURCE_DIRECTORY *dir )
+static void check_empty( IMAGE_RESOURCE_DIRECTORY *dir )
 {
     char *pad;
 
@@ -203,13 +203,13 @@ void check_empty( IMAGE_RESOURCE_DIRECTORY *dir )
     ok( !memcmp( pad, "PADDINGXXPADDING", 16), "padding wrong\n");
 }
 
-void check_not_empty( IMAGE_RESOURCE_DIRECTORY *dir )
+static void check_not_empty( IMAGE_RESOURCE_DIRECTORY *dir )
 {
     ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries should be 0 instead of %d\n", dir->NumberOfNamedEntries);
     ok( dir->NumberOfIdEntries == 1, "NumberOfIdEntries should be 1 instead of %d\n", dir->NumberOfIdEntries);
 }
 
-void check_exe( res_check_func fn )
+static void check_exe( res_check_func fn )
 {
     IMAGE_DOS_HEADER *dos;
     IMAGE_NT_HEADERS *nt;

dlls/msxml3/tests/schema.c

@@ -39,7 +39,7 @@ static const WCHAR schema_xml[] = {
     '<','/','S','c','h','e','m','a','>','\n',0
 };
 
-void test_schema_refs(void)
+static void test_schema_refs(void)
 {
     IXMLDOMDocument2 *doc;
     IXMLDOMSchemaCollection *schema;

dlls/ntdll/tests/om.c

@@ -45,7 +45,7 @@ static NTSTATUS (WINAPI *pNtOpenSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJEC
 static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING);
 
 
-void test_case_sensitive (void)
+static void test_case_sensitive (void)
 {
     static const WCHAR buffer1[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\\','t','e','s','t',0};
     static const WCHAR buffer2[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\\','T','e','s','t',0};
@@ -96,7 +96,7 @@ void test_case_sensitive (void)
     pNtClose(Event);
 }
 
-void test_namespace_pipe(void)
+static void test_namespace_pipe(void)
 {
     static const WCHAR buffer1[] = {'\\','?','?','\\','P','I','P','E','\\','t','e','s','t','\\','p','i','p','e',0};
     static const WCHAR buffer2[] = {'\\','?','?','\\','P','I','P','E','\\','T','E','S','T','\\','P','I','P','E',0};
@@ -278,7 +278,7 @@ static void test_name_collisions(void)
     pNtClose(dir);
 }
 
-void test_directory(void)
+static void test_directory(void)
 {
     NTSTATUS status;
     UNICODE_STRING str;
@@ -465,7 +465,7 @@ void test_directory(void)
     status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr); \
     ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status);
 
-void test_symboliclink(void)
+static void test_symboliclink(void)
 {
     NTSTATUS status;
     UNICODE_STRING str, target;

dlls/opengl32/wgl.c

@@ -363,7 +363,7 @@ static void tess_callback_end(void)
 /***********************************************************************
  *		wglUseFontOutlines_common
  */
-BOOL WINAPI wglUseFontOutlines_common(HDC hdc,
+static BOOL WINAPI wglUseFontOutlines_common(HDC hdc,
                                       DWORD first,
                                       DWORD count,
                                       DWORD listBase,
@@ -524,7 +524,7 @@ error_in_list:
 
 #else /* HAVE_GL_GLU_H */
 
-BOOL WINAPI wglUseFontOutlines_common(HDC hdc,
+static BOOL WINAPI wglUseFontOutlines_common(HDC hdc,
                                       DWORD first,
                                       DWORD count,
                                       DWORD listBase,

dlls/shell32/clipboard.c

@@ -248,23 +248,3 @@ HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags)
 	GlobalUnlock(hGlobal);
 	return hGlobal;
 }
-
-/**************************************************************************
- * IsDataInClipboard
- *
- * checks if there is something in the clipboard we can use
- */
-BOOL IsDataInClipboard (HWND hwnd)
-{
-	BOOL ret = FALSE;
-
-	if (OpenClipboard(hwnd))
-	{
-	  if (GetOpenClipboardWindow())
-	  {
-	    ret = IsClipboardFormatAvailable(CF_TEXT);
-	  }
-	  CloseClipboard();
-	}
-	return ret;
-}

dlls/user32/tests/win.c

@@ -4139,7 +4139,7 @@ static void test_ShowWindow(void)
     ok(!IsWindow(hwnd), "window should not exist\n");
 }
 
-void test_gettext(void)
+static void test_gettext(void)
 {
     WNDCLASS cls;
     LPCSTR clsname = "gettexttest";

dlls/wined3d/device.c

@@ -5344,7 +5344,7 @@ static HRESULT  WINAPI  IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice*
     return WINED3D_OK;
 }
 
-void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) {
+static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) {
     IWineD3DDeviceImpl *This = surface->resource.wineD3DDevice; /* for GL_SUPPORT */
 
     /* Reallocate proper memory for the front and back buffer and adjust their sizes */

dlls/wined3d/directx.c

@@ -268,7 +268,7 @@ static void select_shader_mode(
 }
 
 /** Select the number of report maximum shader constants based on the selected shader modes */
-void select_shader_max_constants(
+static void select_shader_max_constants(
     int ps_selected_mode,
     int vs_selected_mode,
     WineD3D_GL_Info *gl_info) {

dlls/wined3d/drawprim.c

@@ -856,7 +856,7 @@ static void depth_copy(IWineD3DDevice *iface) {
     }
 }
 
-inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, UINT numberOfVertices,
+static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, UINT numberOfVertices,
                                  GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex,
                                  ULONG startIdx, ULONG startVertex) {
     UINT numInstances = 0;

dlls/wined3d/glsl_shader.c

@@ -75,7 +75,7 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) {
 /**
  * Loads (pixel shader) samplers
  */
-void shader_glsl_load_psamplers(
+static void shader_glsl_load_psamplers(
     WineD3D_GL_Info *gl_info,
     IWineD3DStateBlock* iface) {
 
@@ -165,7 +165,7 @@ static void shader_glsl_load_constantsF(IWineD3DBaseShaderImpl* This, WineD3D_GL
  * Loads integer constants (aka uniforms) into the currently set GLSL program.
  * When @constants_set == NULL, it will load all the constants.
  */
-void shader_glsl_load_constantsI(
+static void shader_glsl_load_constantsI(
     IWineD3DBaseShaderImpl* This,
     WineD3D_GL_Info *gl_info,
     GLhandleARB programId,
@@ -223,7 +223,7 @@ void shader_glsl_load_constantsI(
  * Loads boolean constants (aka uniforms) into the currently set GLSL program.
  * When @constants_set == NULL, it will load all the constants.
  */
-void shader_glsl_load_constantsB(
+static void shader_glsl_load_constantsB(
     IWineD3DBaseShaderImpl* This,
     WineD3D_GL_Info *gl_info,
     GLhandleARB programId,

dlls/wined3d/state.c

@@ -2754,7 +2754,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte
     }
 }
 
-inline void drawPrimitiveTraceDataLocations(
+static inline void drawPrimitiveTraceDataLocations(
     WineDirect3DVertexStridedData *dataLocations) {
 
     /* Dump out what parts we have supplied */

dlls/wined3d/surface.c

@@ -1381,7 +1381,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) {
    IWineD3DSurface Internal (No mapping to directx api) parts follow
    ****************************************************** */
 
-HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp) {
+static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp) {
     BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & DDSD_CKSRCBLT);
     const PixelFormatDesc *formatEntry = getFormatDescEntry(This->resource.format);
 
@@ -1642,7 +1642,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
    For now it only supports GL_EXT_paletted_texture extension but support for other
    extensions like ARB_fragment_program and ATI_fragment_shaders will be added as well.
 */
-void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) {
+static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) {
     IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
     IWineD3DPaletteImpl* pal = This->palette;
     BYTE table[256][4];

dlls/wined3d/utils.c

@@ -604,7 +604,7 @@ const char* debug_d3dtexturestate(DWORD state) {
   }
 }
 
-const char* debug_d3dtop(WINED3DTEXTUREOP d3dtop) {
+static const char* debug_d3dtop(WINED3DTEXTUREOP d3dtop) {
     switch (d3dtop) {
 #define D3DTOP_TO_STR(u) case u: return #u
         D3DTOP_TO_STR(WINED3DTOP_DISABLE);

dlls/wineesd.drv/audio.c

@@ -267,7 +267,7 @@ void volume_effect16(void *bufin, void* bufout, int length, int left,
 }
 
 /* length is the number of 8 bit samples */
-void volume_effect8(void *bufin, void* bufout, int length, int left,
+static void volume_effect8(void *bufin, void* bufout, int length, int left,
 		int right, int 	nChannels)
 {
   BYTE *d_out = (BYTE *)bufout;

dlls/winex11.drv/opengl.c

@@ -816,7 +816,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf
   return nAttribs;
 }
 
-BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, int *fmt_id, int *fmt_index)
+static BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, int *fmt_id, int *fmt_index)
 {
     GLXFBConfig* cfgs = NULL;
     int i;

dlls/winspool.drv/info.c

@@ -843,7 +843,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW
  * flush the cached PORT_INFO_2W - data
  */
 
-void monitor_flush(monitor_t * pm)
+static void monitor_flush(monitor_t * pm)
 {
     if (!pm) return;
 

programs/cmd/builtins.c

@@ -173,7 +173,7 @@ void WCMD_copy (void) {
  * they do not already exist.
  */
 
-BOOL create_full_path(CHAR* path)
+static BOOL create_full_path(CHAR* path)
 {
     int len;
     CHAR *new_path;

programs/oleview/details.c

@@ -28,7 +28,7 @@ static const WCHAR wszProxyStubClsid32[] =
     { 'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2','\0' };
 static const WCHAR wszTypeLib[] = { 'T','y','p','e','L','i','b','\0' };
 
-void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL addings)
+static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL addings)
 {
     int i=0, j, retEnum;
     HKEY hCurKey;
@@ -201,7 +201,7 @@ void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL addings)
     }
 }
 
-void CreateReg(WCHAR *buffer)
+static void CreateReg(WCHAR *buffer)
 {
     HKEY hKey;
     DWORD lenBuffer=-1, lastLenBuffer, lenTree;
@@ -328,7 +328,7 @@ void RefreshDetails(HTREEITEM item)
     if(show) CreateReg(wszBuf);
 }
 
-void CreateTabCtrl(HWND hWnd)
+static void CreateTabCtrl(HWND hWnd)
 {
     TCITEM tci;
     WCHAR buffer[MAX_LOAD_STRING];

programs/oleview/interface.c

@@ -40,7 +40,7 @@ BOOL IsInterface(HTREEITEM item)
     return FALSE;
 }
 
-IUnknown *GetInterface(void)
+static IUnknown *GetInterface(void)
 {
     HTREEITEM hSelect;
     TVITEM tvi;
@@ -116,7 +116,7 @@ INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg,
     return FALSE;
 }
 
-void IPersistStreamInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
+static void IPersistStreamInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
 {
     DIALOG_INFO di;
     WCHAR wszClassMoniker[] = { 'C','l','a','s','s','M','o','n','i','k','e','r','\0' };
@@ -130,7 +130,7 @@ void IPersistStreamInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
             globals.hMainWnd, InterfaceViewerProc, (LPARAM)&di);
 }
 
-void IPersistInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
+static void IPersistInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
 {
     DIALOG_INFO di;
     WCHAR wszClassMoniker[] = { 'C','l','a','s','s','M','o','n','i','k','e','r','\0' };
@@ -144,7 +144,7 @@ void IPersistInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
             globals.hMainWnd, InterfaceViewerProc, (LPARAM)&di);
 }
 
-void DefaultInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
+static void DefaultInterfaceViewer(WCHAR *clsid, WCHAR *wszName)
 {
     DIALOG_INFO di;
 

programs/oleview/oleview.c

@@ -131,7 +131,7 @@ INT_PTR CALLBACK CreateInstOnProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM
     return FALSE;
 }
 
-void InitOpenFileName(HWND hWnd, OPENFILENAME *pofn, WCHAR *wszFilter,
+static void InitOpenFileName(HWND hWnd, OPENFILENAME *pofn, WCHAR *wszFilter,
         WCHAR *wszTitle, WCHAR *wszFileName)
 {
     memset(pofn, 0, sizeof(OPENFILENAME));
@@ -147,7 +147,7 @@ void InitOpenFileName(HWND hWnd, OPENFILENAME *pofn, WCHAR *wszFilter,
     pofn->Flags = OFN_HIDEREADONLY;
 }
 
-void CopyClsid(HTREEITEM item)
+static void CopyClsid(HTREEITEM item)
 {
     TVITEM tvi;
 
@@ -168,7 +168,7 @@ void CopyClsid(HTREEITEM item)
     }
 }
 
-void CopyHTMLTag(HTREEITEM item)
+static void CopyHTMLTag(HTREEITEM item)
 {
     TVITEM tvi;
 
@@ -193,7 +193,7 @@ void CopyHTMLTag(HTREEITEM item)
     }
 }
 
-void ResizeChild(void)
+static void ResizeChild(void)
 {
     RECT client, stat, tool;
 
@@ -280,7 +280,7 @@ void RefreshMenu(HTREEITEM item)
         EnableMenuItem(hMenu, IDM_COPYCLSID, MF_ENABLED);
 }
 
-int MenuCommand(WPARAM wParam, HWND hWnd)
+static int MenuCommand(WPARAM wParam, HWND hWnd)
 {
     BOOL vis;
     HTREEITEM hSelect;
@@ -426,7 +426,7 @@ int MenuCommand(WPARAM wParam, HWND hWnd)
     return 0;
 }
 
-void UpdateStatusBar(int itemID)
+static void UpdateStatusBar(int itemID)
 {
     WCHAR info[MAX_LOAD_STRING];
 
@@ -475,7 +475,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg,
     return 0;
 }
 
-BOOL InitApplication(HINSTANCE hInst)
+static BOOL InitApplication(HINSTANCE hInst)
 {
     WNDCLASS wc;
     WCHAR wszAppName[MAX_LOAD_STRING];
@@ -494,7 +494,7 @@ BOOL InitApplication(HINSTANCE hInst)
     return TRUE;
 }
 
-BOOL InitInstance(HINSTANCE hInst, int nCmdShow)
+static BOOL InitInstance(HINSTANCE hInst, int nCmdShow)
 {
     HWND hWnd;
     WCHAR wszAppName[MAX_LOAD_STRING];

programs/oleview/pane.c

@@ -20,7 +20,7 @@
 
 #include "main.h"
 
-int GetSplitPos(HWND hWnd)
+static int GetSplitPos(HWND hWnd)
 {
     PANE *pane = (PANE *)GetMenu(hWnd);
 
@@ -30,7 +30,7 @@ int GetSplitPos(HWND hWnd)
             pane->pos : pane->width-pane->size/2-1);
 }
 
-void DrawSplitMoving(HWND hWnd, int x)
+static void DrawSplitMoving(HWND hWnd, int x)
 {
     RECT rt;
     HDC hdc = GetDC(hWnd);

programs/oleview/tree.c

@@ -37,7 +37,7 @@ static const WCHAR wszComponentCategories[] = { 'C','o','m','p','o','n','e','n',
     ' ','C','a','t','e','g','o','r','i','e','s','\\','\0' };
 static const WCHAR wszGetPath[] = { '0','\\','w','i','n','3','2','\0' };
 
-LPARAM CreateITEM_INFO(INT flag, const WCHAR *info, const WCHAR *clsid, const WCHAR *path)
+static LPARAM CreateITEM_INFO(INT flag, const WCHAR *info, const WCHAR *clsid, const WCHAR *path)
 {
     ITEM_INFO *reg;
 
@@ -248,7 +248,7 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize)
     return ret;
 }
 
-void AddCOMandAll(void)
+static void AddCOMandAll(void)
 {
     TVINSERTSTRUCT tvis;
     TVITEM tvi;
@@ -336,7 +336,7 @@ void AddCOMandAll(void)
     SendMessage(globals.hTree, TVM_SORTCHILDREN, FALSE, (LPARAM)tree.hAO);
 }
 
-void AddApplicationID(void)
+static void AddApplicationID(void)
 {
     TVINSERTSTRUCT tvis;
     HKEY hKey, hCurKey;
@@ -376,7 +376,7 @@ void AddApplicationID(void)
     SendMessage(globals.hTree, TVM_SORTCHILDREN, FALSE, (LPARAM)tree.hAID);
 }
 
-void AddTypeLib(void)
+static void AddTypeLib(void)
 {
     TVINSERTSTRUCT tvis;
     HKEY hKey, hCurKey, hInfoKey, hPath;
@@ -447,7 +447,7 @@ void AddTypeLib(void)
     SendMessage(globals.hTree, TVM_SORTCHILDREN, FALSE, (LPARAM)tree.hTL);
 }
 
-void AddInterfaces(void)
+static void AddInterfaces(void)
 {
     TVINSERTSTRUCT tvis;
     HKEY hKey, hCurKey;
@@ -488,7 +488,7 @@ void AddInterfaces(void)
     SendMessage(globals.hTree, TVM_SORTCHILDREN, FALSE, (LPARAM)tree.hI);
 }
 
-void AddComponentCategories(void)
+static void AddComponentCategories(void)
 {
     TVINSERTSTRUCT tvis;
     HKEY hKey, hCurKey;
@@ -537,7 +537,7 @@ void AddComponentCategories(void)
     SendMessage(globals.hTree, TVM_SORTCHILDREN, FALSE, (LPARAM)tree.hGBCC);
 }
 
-void AddBaseEntries(void)
+static void AddBaseEntries(void)
 {
     TVINSERTSTRUCT tvis;
     WCHAR name[MAX_LOAD_STRING];

programs/oleview/typelib.c

@@ -97,7 +97,7 @@ static const WCHAR wszDefaultValue[]
 static const WCHAR wszReadOnly[] = { 'r','e','a','d','o','n','l','y','\0' };
 static const WCHAR wszConst[] = { 'c','o','n','s','t','\0' };
 
-void ShowLastError(void)
+static void ShowLastError(void)
 {
     DWORD error = GetLastError();
     LPWSTR lpMsgBuf;
@@ -112,7 +112,7 @@ void ShowLastError(void)
     return;
 }
 
-void SaveIdl(WCHAR *wszFileName)
+static void SaveIdl(WCHAR *wszFileName)
 {
     HTREEITEM hIDL;
     TVITEM tvi;
@@ -154,7 +154,7 @@ void SaveIdl(WCHAR *wszFileName)
     CloseHandle(hFile);
 }
 
-void GetSaveIdlAsPath(void)
+static void GetSaveIdlAsPath(void)
 {
     OPENFILENAME saveidl;
     WCHAR *pFileName;
@@ -273,13 +273,13 @@ static TYPELIB_DATA *InitializeTLData(void)
     return pTLData;
 }
 
-void AddSpaces(TYPELIB_DATA *pTLData, int tabSize)
+static void AddSpaces(TYPELIB_DATA *pTLData, int tabSize)
 {
     for(; tabSize>0; tabSize--)
         AddToTLDataStrW(pTLData, wszSpace);
 }
 
-void AddChildrenData(HTREEITEM hParent, TYPELIB_DATA *pData)
+static void AddChildrenData(HTREEITEM hParent, TYPELIB_DATA *pData)
 {
     HTREEITEM hCur;
     TVITEM tvi;
@@ -298,7 +298,7 @@ void AddChildrenData(HTREEITEM hParent, TYPELIB_DATA *pData)
     }while((hCur = TreeView_GetNextSibling(typelib.hTree, hCur)));
 }
 
-void CreateTypeInfo(WCHAR *wszAddTo, WCHAR *wszAddAfter, TYPEDESC tdesc, ITypeInfo *pTypeInfo)
+static void CreateTypeInfo(WCHAR *wszAddTo, WCHAR *wszAddAfter, TYPEDESC tdesc, ITypeInfo *pTypeInfo)
 {
     int i;
     BSTR bstrData;
@@ -373,7 +373,7 @@ void CreateTypeInfo(WCHAR *wszAddTo, WCHAR *wszAddAfter, TYPEDESC tdesc, ITypeIn
     }
 }
 
-int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent)
+static int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent)
 {
     int i;
     TVINSERTSTRUCT tvis;
@@ -437,7 +437,7 @@ int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent)
     return 0;
 }
 
-int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent)
+static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent)
 {
     int i;
     TVINSERTSTRUCT tvis;
@@ -499,7 +499,7 @@ int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent)
     return 0;
 }
 
-int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent)
+static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent)
 {
     int i, j, tabSize;
     unsigned namesNo;
@@ -689,7 +689,7 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent)
     return 0;
 }
 
-int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent)
+static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent)
 {
     int i;
     TVINSERTSTRUCT tvis;
@@ -737,7 +737,7 @@ int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent)
     return 0;
 }
 
-void AddIdlData(HTREEITEM hCur, TYPELIB_DATA *pTLData)
+static void AddIdlData(HTREEITEM hCur, TYPELIB_DATA *pTLData)
 {
     TVITEM tvi;
 
@@ -755,7 +755,7 @@ void AddIdlData(HTREEITEM hCur, TYPELIB_DATA *pTLData)
     }
 }
 
-void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData)
+static void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData)
 {
     HTREEITEM hCur;
     TVITEM tvi;
@@ -789,7 +789,7 @@ void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData)
     }
 }
 
-void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wszName,
+static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wszName,
         WCHAR *wszHelpString, unsigned long ulHelpContext, TYPEATTR *pTypeAttr,
         TYPELIB_DATA *pTLData)
 {
@@ -919,7 +919,7 @@ void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wszName,
     AddToStrW(pTLData->wszInsertAfter, wszNewLine);
 }
 
-void CreateTypedefHeader(ITypeInfo *pTypeInfo,
+static void CreateTypedefHeader(ITypeInfo *pTypeInfo,
         TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData)
 {
     BOOL bFirst = TRUE;
@@ -957,7 +957,7 @@ void CreateTypedefHeader(ITypeInfo *pTypeInfo,
     }
 }
 
-int PopulateTree(void)
+static int PopulateTree(void)
 {
     TVINSERTSTRUCT tvis;
     TVITEM tvi;
@@ -1285,7 +1285,7 @@ void UpdateData(HTREEITEM item)
     SetWindowText(typelib.hEdit, ((TYPELIB_DATA*)tvi.lParam)->idl);
 }
 
-void TypeLibResizeChild(void)
+static void TypeLibResizeChild(void)
 {
     RECT client, stat;
 
@@ -1300,7 +1300,7 @@ void TypeLibResizeChild(void)
             client.right, client.bottom-stat.bottom, TRUE);
 }
 
-void TypeLibMenuCommand(WPARAM wParam, HWND hWnd)
+static void TypeLibMenuCommand(WPARAM wParam, HWND hWnd)
 {
     BOOL vis;
 
@@ -1322,7 +1322,7 @@ void TypeLibMenuCommand(WPARAM wParam, HWND hWnd)
     }
 }
 
-void UpdateTypeLibStatusBar(int itemID)
+static void UpdateTypeLibStatusBar(int itemID)
 {
     WCHAR info[MAX_LOAD_STRING];
 
@@ -1332,7 +1332,7 @@ void UpdateTypeLibStatusBar(int itemID)
     SendMessage(typelib.hStatusBar, SB_SETTEXT, 0, (LPARAM)info);
 }
 
-void EmptyTLTree(void)
+static void EmptyTLTree(void)
 {
     HTREEITEM cur, del;
     TVITEM tvi;

programs/regedit/childwnd.c

@@ -140,7 +140,7 @@ LPTSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) {
     return ret;
 }
 
-LPTSTR GetPathFullPath(HWND hwndTV, LPTSTR path) {
+static LPTSTR GetPathFullPath(HWND hwndTV, LPTSTR path) {
     LPTSTR parts[2];
     LPTSTR ret;
 

tools/widl/header.c

@@ -209,7 +209,7 @@ static void write_enums(FILE *h, var_list_t *enums)
   fprintf(h, "\n");
 }
 
-int needs_space_after(type_t *t)
+static int needs_space_after(type_t *t)
 {
   return t->kind == TKIND_ALIAS || ! is_ptr(t);
 }