SHELL32: make some functions static
Mike McCormack
mike at codeweavers.com
Fri Jun 17 23:53:03 CDT 2005
ChangeLog:
* make some functions static
-------------- next part --------------
Index: dlls/shell32/tests/shlfileop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/tests/shlfileop.c,v
retrieving revision 1.19
diff -u -p -r1.19 shlfileop.c
--- dlls/shell32/tests/shlfileop.c 1 Jun 2005 11:04:26 -0000 1.19
+++ dlls/shell32/tests/shlfileop.c 18 Jun 2005 04:54:53 -0000
@@ -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
/* 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;
Index: dlls/shell32/systray.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/systray.c,v
retrieving revision 1.29
diff -u -p -r1.29 systray.c
--- dlls/shell32/systray.c 18 Apr 2005 10:30:55 -0000 1.29
+++ dlls/shell32/systray.c 18 Jun 2005 04:54:53 -0000
@@ -157,7 +157,7 @@ static LRESULT CALLBACK SYSTRAY_WndProc(
}
-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
}
-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 *pt
}
-void SYSTRAY_ItemSetTip(SystrayItem *ptrayItem, CHAR* szTip, int modify)
+static void SYSTRAY_ItemSetTip(SystrayItem *ptrayItem, CHAR* szTip, int modify)
{
TTTOOLINFOA ti;
Index: dlls/shell32/shlmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlmenu.c,v
retrieving revision 1.39
diff -u -p -r1.39 shlmenu.c
--- dlls/shell32/shlmenu.c 23 Mar 2005 13:15:19 -0000 1.39
+++ dlls/shell32/shlmenu.c 18 Jun 2005 04:54:53 -0000
@@ -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;
More information about the wine-patches
mailing list