COMCTL32: warning fixes for -Wmissing-declarations and -Wwrite-strings
Mike McCormack
mike at codeweavers.com
Wed Jun 8 23:01:49 CDT 2005
ChangeLog:
* warning fixes for -Wmissing-declarations and -Wwrite-strings
-------------- next part --------------
Index: dlls/comctl32/comctl32.h
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl32.h,v
retrieving revision 1.34
diff -u -p -r1.34 comctl32.h
--- dlls/comctl32/comctl32.h 19 Oct 2004 22:59:59 -0000 1.34
+++ dlls/comctl32/comctl32.h 9 Jun 2005 04:03:04 -0000
@@ -191,4 +191,62 @@ BOOL WINAPI DPA_Merge (const HDPA, const
LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet);
BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2);
+extern void ANIMATE_Register(void);
+extern void ANIMATE_Unregister(void);
+extern void COMBOEX_Register(void);
+extern void COMBOEX_Unregister(void);
+extern void DATETIME_Register(void);
+extern void DATETIME_Unregister(void);
+extern void FLATSB_Register(void);
+extern void FLATSB_Unregister(void);
+extern void HEADER_Register(void);
+extern void HEADER_Unregister(void);
+extern void HOTKEY_Register(void);
+extern void HOTKEY_Unregister(void);
+extern void IPADDRESS_Register(void);
+extern void IPADDRESS_Unregister(void);
+extern void LISTVIEW_Register(void);
+extern void LISTVIEW_Unregister(void);
+extern void MONTHCAL_Register(void);
+extern void MONTHCAL_Unregister(void);
+extern void NATIVEFONT_Register(void);
+extern void NATIVEFONT_Unregister(void);
+extern void PAGER_Register(void);
+extern void PAGER_Unregister(void);
+extern void PROGRESS_Register(void);
+extern void PROGRESS_Unregister(void);
+extern void REBAR_Register(void);
+extern void REBAR_Unregister(void);
+extern void STATUS_Register(void);
+extern void STATUS_Unregister(void);
+extern void SYSLINK_Register(void);
+extern void SYSLINK_Unregister(void);
+extern void TAB_Register(void);
+extern void TAB_Unregister(void);
+extern void TOOLBAR_Register(void);
+extern void TOOLBAR_Unregister(void);
+extern void TOOLTIPS_Register(void);
+extern void TOOLTIPS_Unregister(void);
+extern void TRACKBAR_Register(void);
+extern void TRACKBAR_Unregister(void);
+extern void TREEVIEW_Register(void);
+extern void TREEVIEW_Unregister(void);
+extern void UPDOWN_Register(void);
+extern void UPDOWN_Unregister(void);
+
+
+int MONTHCAL_MonthLength(int month, int year);
+
+static inline void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to)
+{
+ to->wYear = from->wYear;
+ to->wMonth = from->wMonth;
+ to->wDayOfWeek = from->wDayOfWeek;
+ to->wDay = from->wDay;
+ to->wHour = from->wHour;
+ to->wMinute = from->wMinute;
+ to->wSecond = from->wSecond;
+ to->wMilliseconds = from->wMilliseconds;
+}
+
#endif /* __WINE_COMCTL32_H */
Index: dlls/comctl32/commctrl.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/commctrl.c,v
retrieving revision 1.93
diff -u -p -r1.93 commctrl.c
--- dlls/comctl32/commctrl.c 25 Mar 2005 20:49:00 -0000 1.93
+++ dlls/comctl32/commctrl.c 9 Jun 2005 04:03:05 -0000
@@ -73,49 +73,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
-extern void ANIMATE_Register(void);
-extern void ANIMATE_Unregister(void);
-extern void COMBOEX_Register(void);
-extern void COMBOEX_Unregister(void);
-extern void DATETIME_Register(void);
-extern void DATETIME_Unregister(void);
-extern void FLATSB_Register(void);
-extern void FLATSB_Unregister(void);
-extern void HEADER_Register(void);
-extern void HEADER_Unregister(void);
-extern void HOTKEY_Register(void);
-extern void HOTKEY_Unregister(void);
-extern void IPADDRESS_Register(void);
-extern void IPADDRESS_Unregister(void);
-extern void LISTVIEW_Register(void);
-extern void LISTVIEW_Unregister(void);
-extern void MONTHCAL_Register(void);
-extern void MONTHCAL_Unregister(void);
-extern void NATIVEFONT_Register(void);
-extern void NATIVEFONT_Unregister(void);
-extern void PAGER_Register(void);
-extern void PAGER_Unregister(void);
-extern void PROGRESS_Register(void);
-extern void PROGRESS_Unregister(void);
-extern void REBAR_Register(void);
-extern void REBAR_Unregister(void);
-extern void STATUS_Register(void);
-extern void STATUS_Unregister(void);
-extern void SYSLINK_Register(void);
-extern void SYSLINK_Unregister(void);
-extern void TAB_Register(void);
-extern void TAB_Unregister(void);
-extern void TOOLBAR_Register(void);
-extern void TOOLBAR_Unregister(void);
-extern void TOOLTIPS_Register(void);
-extern void TOOLTIPS_Unregister(void);
-extern void TRACKBAR_Register(void);
-extern void TRACKBAR_Unregister(void);
-extern void TREEVIEW_Register(void);
-extern void TREEVIEW_Unregister(void);
-extern void UPDOWN_Register(void);
-extern void UPDOWN_Unregister(void);
-
LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
LPWSTR COMCTL32_wSubclass = NULL;
Index: dlls/comctl32/flatsb.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/flatsb.c,v
retrieving revision 1.34
diff -u -p -r1.34 flatsb.c
--- dlls/comctl32/flatsb.c 23 Mar 2005 10:22:52 -0000 1.34
+++ dlls/comctl32/flatsb.c 9 Jun 2005 04:03:05 -0000
@@ -36,6 +36,7 @@
#include "winerror.h"
#include "winuser.h"
#include "commctrl.h"
+#include "comctl32.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Index: dlls/comctl32/listview.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/listview.c,v
retrieving revision 1.420
diff -u -p -r1.420 listview.c
--- dlls/comctl32/listview.c 4 Jun 2005 10:00:12 -0000 1.420
+++ dlls/comctl32/listview.c 9 Jun 2005 04:03:06 -0000
@@ -6926,7 +6926,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS
return oldspacing;
}
-inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
+static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
{
INT cx, cy;
Index: dlls/comctl32/monthcal.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/monthcal.c,v
retrieving revision 1.58
diff -u -p -r1.58 monthcal.c
--- dlls/comctl32/monthcal.c 30 May 2005 09:56:57 -0000 1.58
+++ dlls/comctl32/monthcal.c 9 Jun 2005 04:03:06 -0000
@@ -134,7 +134,7 @@ static const int DayOfWeekTable[] = {0,
/* january is 1, december is 12 */
int MONTHCAL_MonthLength(int month, int year)
{
-const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
+ const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
/*Wrap around, this eases handling*/
if(month == 0)
month = 12;
@@ -167,19 +167,6 @@ static int MONTHCAL_ValidateTime(SYSTEMT
if(time.wMilliseconds > 999) return FALSE;
return TRUE;
-}
-
-
-void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to)
-{
- to->wYear = from->wYear;
- to->wMonth = from->wMonth;
- to->wDayOfWeek = from->wDayOfWeek;
- to->wDay = from->wDay;
- to->wHour = from->wHour;
- to->wMinute = from->wMinute;
- to->wSecond = from->wSecond;
- to->wMilliseconds = from->wMilliseconds;
}
Index: dlls/comctl32/propsheet.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.126
diff -u -p -r1.126 propsheet.c
--- dlls/comctl32/propsheet.c 25 Mar 2005 20:49:00 -0000 1.126
+++ dlls/comctl32/propsheet.c 9 Jun 2005 04:03:07 -0000
@@ -296,7 +296,7 @@ static void PROPSHEET_GetPageRect(const
*
* Find page index corresponding to page resource id.
*/
-INT PROPSHEET_FindPageByResId(PropSheetInfo * psInfo, LRESULT resId)
+static INT PROPSHEET_FindPageByResId(PropSheetInfo * psInfo, LRESULT resId)
{
INT i;
@@ -1265,7 +1265,7 @@ static BOOL PROPSHEET_CreateTabControl(H
* Subclassing window procedure for wizard extrior pages to prevent drawing
* background and so drawing above the watermark.
*/
-LRESULT CALLBACK
+static LRESULT CALLBACK
PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef)
{
switch (uMsg)
Index: dlls/comctl32/tests/dpa.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/tests/dpa.c,v
retrieving revision 1.6
diff -u -p -r1.6 dpa.c
--- dlls/comctl32/tests/dpa.c 22 Apr 2005 21:18:12 -0000 1.6
+++ dlls/comctl32/tests/dpa.c 9 Jun 2005 04:03:07 -0000
@@ -41,7 +41,7 @@ static INT CALLBACK dpa_strcmp(LPVOID pv
return lstrcmpA (str1, str2);
}
-void DPA_test()
+static void DPA_test(void)
{
HDPA dpa_ret;
INT int_ret;
Index: dlls/comctl32/tests/tab.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/tests/tab.c,v
retrieving revision 1.4
diff -u -p -r1.4 tab.c
--- dlls/comctl32/tests/tab.c 27 Jan 2004 04:01:10 -0000 1.4
+++ dlls/comctl32/tests/tab.c 9 Jun 2005 04:03:07 -0000
@@ -39,7 +39,7 @@
#define trace_tab(str)
#endif
-HWND
+static HWND
create_tabcontrol (DWORD style)
{
HWND handle;
@@ -76,7 +76,7 @@ create_tabcontrol (DWORD style)
return handle;
}
-void CheckSize(HWND hwnd, INT width, INT height)
+static void CheckSize(HWND hwnd, INT width, INT height)
{
RECT rTab, r1;
@@ -95,7 +95,7 @@ void CheckSize(HWND hwnd, INT width, INT
"Expected [%d,%d] got [%ld,%ld]\n", width, height, rTab.right - rTab.left, rTab.bottom - rTab.top);
}
-void TabCheckSetSize(HWND hwnd, INT SetWidth, INT SetHeight, INT ExpWidth, INT ExpHeight)
+static void TabCheckSetSize(HWND hwnd, INT SetWidth, INT SetHeight, INT ExpWidth, INT ExpHeight)
{
SendMessage (hwnd, TCM_SETITEMSIZE, 0,
(LPARAM) MAKELPARAM((SetWidth >= 0) ? SetWidth:0, (SetHeight >= 0) ? SetHeight:0));
Index: dlls/comctl32/tests/updown.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/tests/updown.c,v
retrieving revision 1.2
diff -u -p -r1.2 updown.c
--- dlls/comctl32/tests/updown.c 18 Mar 2005 14:09:12 -0000 1.2
+++ dlls/comctl32/tests/updown.c 9 Jun 2005 04:03:07 -0000
@@ -27,7 +27,7 @@
static HDC desktopDC;
static HINSTANCE hinst;
-HWND create_edit_control (DWORD style, DWORD exstyle)
+static HWND create_edit_control (DWORD style, DWORD exstyle)
{
HWND handle;
@@ -43,7 +43,7 @@ HWND create_edit_control (DWORD style, D
return handle;
}
-HWND create_updown_control (HWND hWndEdit)
+static HWND create_updown_control (HWND hWndEdit)
{
HWND hWndUpDown;
More information about the wine-patches
mailing list