fix some -Wstrict-prototypes warning
Stefan Huehner
stefan at huehner.org
Thu Jun 16 15:48:08 CDT 2005
Hi,
next patch in series to remove -Wstrict-prototypes warnings.
ChangeLog:
- remove some -Wstrict-prototypes warnings
Regards,
Stefan
-------------- next part --------------
Index: dlls/oleaut32/tests/vartype.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tests/vartype.c,v
retrieving revision 1.24
diff -u -p -r1.24 vartype.c
--- dlls/oleaut32/tests/vartype.c 13 Jun 2005 12:10:55 -0000 1.24
+++ dlls/oleaut32/tests/vartype.c 16 Jun 2005 20:40:31 -0000
@@ -4632,7 +4632,7 @@ static inline BSTR GetBSTR(const LPINTER
return (BSTR)bstr->szString;
}
-static void test_SysStringLen()
+static void test_SysStringLen(void)
{
INTERNAL_BSTR bstr;
BSTR str = GetBSTR(&bstr);
@@ -4643,7 +4643,7 @@ static void test_SysStringLen()
ok (SysStringLen(str) == 1, "Expected dwLen 1, got %d\n", SysStringLen(str));
}
-static void test_SysStringByteLen()
+static void test_SysStringByteLen(void)
{
INTERNAL_BSTR bstr;
BSTR str = GetBSTR(&bstr);
@@ -4654,7 +4654,7 @@ static void test_SysStringByteLen()
ok (SysStringByteLen(str) == 2, "Expected dwLen 2, got %d\n", SysStringByteLen(str));
}
-static void test_SysAllocString()
+static void test_SysAllocString(void)
{
const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
BSTR str;
@@ -4674,7 +4674,7 @@ static void test_SysAllocString()
}
}
-static void test_SysAllocStringLen()
+static void test_SysAllocStringLen(void)
{
const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
BSTR str;
@@ -4710,7 +4710,7 @@ static void test_SysAllocStringLen()
}
}
-static void test_SysAllocStringByteLen()
+static void test_SysAllocStringByteLen(void)
{
const OLECHAR szTest[10] = { 'T','e','s','t','\0' };
const CHAR szTestA[6] = { 'T','e','s','t','\0','?' };
@@ -4766,7 +4766,7 @@ static void test_SysAllocStringByteLen()
}
}
-static void test_SysReAllocString()
+static void test_SysReAllocString(void)
{
const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
const OLECHAR szSmaller[2] = { 'x','\0' };
@@ -4805,7 +4805,7 @@ static void test_SysReAllocString()
}
}
-static void test_SysReAllocStringLen()
+static void test_SysReAllocStringLen(void)
{
const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
const OLECHAR szSmaller[2] = { 'x','\0' };
@@ -4844,7 +4844,7 @@ static void test_SysReAllocStringLen()
}
}
-static void test_BstrCopy()
+static void test_BstrCopy(void)
{
const CHAR szTestA[6] = { 'T','e','s','t','\0','?' };
const CHAR szTestTruncA[4] = { 'T','e','s','\0' };
@@ -5302,7 +5302,7 @@ static void test_ClearCustData(void)
ok(!ci.cCustData && !ci.prgCustData, "ClearCustData didn't clear fields!\n");
}
-static void test_NullByRef()
+static void test_NullByRef(void)
{
VARIANT v1, v2;
HRESULT hRes;
@@ -5333,7 +5333,7 @@ static void test_NullByRef()
}
/* Dst Variant should remain unchanged if VariantChangeType cannot convert */
-static void test_ChangeType_keep_dst()
+static void test_ChangeType_keep_dst(void)
{
VARIANT v1, v2;
BSTR bstr;
-------------- next part --------------
Index: dlls/urlmon/tests/url.c
===================================================================
RCS file: /home/wine/wine/dlls/urlmon/tests/url.c,v
retrieving revision 1.7
diff -u -p -r1.7 url.c
--- dlls/urlmon/tests/url.c 13 Jun 2005 12:10:54 -0000 1.7
+++ dlls/urlmon/tests/url.c 16 Jun 2005 20:40:47 -0000
@@ -52,7 +52,7 @@ static void test_CreateURLMoniker(LPCWST
if(mon2) IMoniker_Release(mon2);
}
-static void test_create()
+static void test_create(void)
{
test_CreateURLMoniker(TEST_URL_1, TEST_PART_URL_1);
}
@@ -196,7 +196,7 @@ static IBindStatusCallback* statusclb_cr
return (IBindStatusCallback*)ret;
}
-static void test_CreateAsyncBindCtx()
+static void test_CreateAsyncBindCtx(void)
{
IBindCtx *bctx = (IBindCtx*)0x0ff00ff0;
HRESULT hres;
@@ -234,7 +234,7 @@ static void test_CreateAsyncBindCtx()
ok(ref == 0, "bsc should be destroyed here\n");
}
-static void test_BindToStorage()
+static void test_BindToStorage(void)
{
IMoniker *mon;
HRESULT hres;
-------------- next part --------------
Index: dlls/user/tests/win.c
===================================================================
RCS file: /home/wine/wine/dlls/user/tests/win.c,v
retrieving revision 1.62
diff -u -p -r1.62 win.c
--- dlls/user/tests/win.c 15 Jun 2005 18:07:33 -0000 1.62
+++ dlls/user/tests/win.c 16 Jun 2005 20:40:59 -0000
@@ -2621,7 +2621,7 @@ static void check_window_style(DWORD dwS
}
/* tests what window styles the window manager automatically adds */
-static void test_window_styles()
+static void test_window_styles(void)
{
register_style_check_class();
@@ -2902,7 +2902,7 @@ static void test_AWR_window_size(BOOL me
#define SHOWSYSMETRIC(SM) trace(#SM "=%d\n", GetSystemMetrics(SM))
-static void test_AdjustWindowRect()
+static void test_AdjustWindowRect(void)
{
if (!AWR_init())
return;
@@ -2952,7 +2952,7 @@ static LRESULT WINAPI redraw_window_proc
}
/* Ensure we exit from RedrawNow regardless of invalidated area */
-static void test_redrawnow() {
+static void test_redrawnow(void) {
WNDCLASSA cls;
HWND hwndMain;
-------------- next part --------------
Index: dlls/winedos/soundblaster.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/soundblaster.c,v
retrieving revision 1.4
diff -u -p -r1.4 soundblaster.c
--- dlls/winedos/soundblaster.c 5 Sep 2003 23:08:28 -0000 1.4
+++ dlls/winedos/soundblaster.c 16 Jun 2005 20:41:06 -0000
@@ -121,7 +121,7 @@ static DWORD CALLBACK SB_Poll( void *dum
return 0;
}
-BOOL SB_Init()
+BOOL SB_Init(void)
{
HRESULT result;
@@ -191,7 +191,7 @@ BOOL SB_Init()
return 1;
}
-void SB_Reset()
+void SB_Reset(void)
{
int i;
-------------- next part --------------
? programs/winefile/license.o.kgVsJr
Index: programs/winefile/winefile.c
===================================================================
RCS file: /home/wine/wine/programs/winefile/winefile.c,v
retrieving revision 1.55
diff -u -p -r1.55 winefile.c
--- programs/winefile/winefile.c 13 Jun 2005 11:38:27 -0000 1.55
+++ programs/winefile/winefile.c 16 Jun 2005 20:39:05 -0000
@@ -166,7 +166,7 @@ typedef struct {
static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND hwnd);
static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd);
static void refresh_child(ChildWnd* child);
-static void refresh_drives();
+static void refresh_drives(void);
static void get_path(Entry* dir, PTSTR path);
static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols);
@@ -240,7 +240,7 @@ static void display_network_error(HWND h
/* allocate and initialise a directory entry */
-static Entry* alloc_entry()
+static Entry* alloc_entry(void)
{
Entry* entry = (Entry*) malloc(sizeof(Entry));
@@ -3979,7 +3979,7 @@ static BOOL prompt_target(Pane* pane, LP
static IContextMenu2* s_pctxmenu2 = NULL;
static IContextMenu3* s_pctxmenu3 = NULL;
-static void CtxMenu_reset()
+static void CtxMenu_reset(void)
{
s_pctxmenu2 = NULL;
s_pctxmenu3 = NULL;
-------------- next part --------------
Index: dlls/winmm/tests/timer.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/tests/timer.c,v
retrieving revision 1.5
diff -u -p -r1.5 timer.c
--- dlls/winmm/tests/timer.c 24 Apr 2005 17:23:51 -0000 1.5
+++ dlls/winmm/tests/timer.c 16 Jun 2005 20:41:17 -0000
@@ -35,7 +35,7 @@
static TIMECAPS tc;
-static void test_timeGetDevCaps()
+static void test_timeGetDevCaps(void)
{
MMRESULT rc;
@@ -169,7 +169,7 @@ void CALLBACK priorityTimeProc(UINT uID,
fired = TRUE;
}
-void test_priority()
+void test_priority(void)
{
UINT id;
Index: dlls/winmm/tests/wave.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/tests/wave.c,v
retrieving revision 1.51
diff -u -p -r1.51 wave.c
--- dlls/winmm/tests/wave.c 11 Apr 2005 12:49:22 -0000 1.51
+++ dlls/winmm/tests/wave.c 16 Jun 2005 20:41:17 -0000
@@ -1030,7 +1030,7 @@ static void wave_out_test_device(int dev
dev_name(device));
}
-static void wave_out_tests()
+static void wave_out_tests(void)
{
WAVEOUTCAPSA capsA;
WAVEOUTCAPSW capsW;
-------------- next part --------------
Index: dlls/winsock/tests/sock.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/tests/sock.c,v
retrieving revision 1.21
diff -u -p -r1.21 sock.c
--- dlls/winsock/tests/sock.c 30 Mar 2005 17:08:32 -0000 1.21
+++ dlls/winsock/tests/sock.c 16 Jun 2005 20:41:27 -0000
@@ -781,7 +781,7 @@ LINGER linger_testvals[] = {
bug in the linux kernel (fixed in 2.6.8) */
#define SOCKTIMEOUT2 997000 /* 997 seconds */
-static void test_set_getsockopt()
+static void test_set_getsockopt(void)
{
SOCKET s;
int i, err;
@@ -826,7 +826,7 @@ static void test_set_getsockopt()
closesocket(s);
}
-static void test_so_reuseaddr()
+static void test_so_reuseaddr(void)
{
struct sockaddr_in saddr;
SOCKET s1,s2;
@@ -940,7 +940,7 @@ static test_setup tests [NUM_TESTS] =
}
};
-static void test_UDP()
+static void test_UDP(void)
{
/* This function tests UDP sendto() and recvfrom(). UDP is unreliable, so it is
possible that this test fails due to dropped packets. */
@@ -1018,7 +1018,7 @@ static void WINAPI do_getservbyname( HAN
}
}
-static void test_getservbyname()
+static void test_getservbyname(void)
{
int i;
HANDLE starttest, thread[NUM_THREADS];
@@ -1039,7 +1039,7 @@ static void test_getservbyname()
}
}
-static void test_WSAAddressToStringA()
+static void test_WSAAddressToStringA(void)
{
INT ret;
DWORD len;
@@ -1106,7 +1106,7 @@ static void test_WSAAddressToStringA()
ok( !strcmp( address, expect4 ), "Expected: %s, got: %s\n", expect4, address );
}
-static void test_WSAAddressToStringW()
+static void test_WSAAddressToStringW(void)
{
INT ret;
DWORD len;
@@ -1174,7 +1174,7 @@ static void test_WSAAddressToStringW()
ok( !lstrcmpW( address, expect4 ), "Expected different address string\n" );
}
-static void test_WSAStringToAddressA()
+static void test_WSAStringToAddressA(void)
{
INT ret, len;
SOCKADDR_IN sockaddr;
@@ -1227,7 +1227,7 @@ static void test_WSAStringToAddressA()
ok( ret, "WSAStringToAddressA() succeeded unexpectedly: %d\n", WSAGetLastError() );
}
-static void test_WSAStringToAddressW()
+static void test_WSAStringToAddressW(void)
{
INT ret, len;
SOCKADDR_IN sockaddr;
-------------- next part --------------
Index: dlls/wintab32/wintab32.c
===================================================================
RCS file: /home/wine/wine/dlls/wintab32/wintab32.c,v
retrieving revision 1.5
diff -u -p -r1.5 wintab32.c
--- dlls/wintab32/wintab32.c 6 May 2005 19:38:50 -0000 1.5
+++ dlls/wintab32/wintab32.c 16 Jun 2005 20:41:41 -0000
@@ -44,7 +44,7 @@ UINT (*pWTInfoA)(UINT wCategory, UINT nI
static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
LPARAM lParam);
-static VOID TABLET_Register()
+static VOID TABLET_Register(void)
{
WNDCLASSW wndClass;
ZeroMemory(&wndClass, sizeof(WNDCLASSW));
@@ -58,7 +58,7 @@ static VOID TABLET_Register()
RegisterClassW(&wndClass);
}
-static VOID TABLET_Unregister()
+static VOID TABLET_Unregister(void)
{
UnregisterClassW(WC_TABLETCLASSNAME, NULL);
}
-------------- next part --------------
Index: dlls/x11drv/xim.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xim.c,v
retrieving revision 1.5
diff -u -p -r1.5 xim.c
--- dlls/x11drv/xim.c 13 Apr 2005 15:23:29 -0000 1.5
+++ dlls/x11drv/xim.c 16 Jun 2005 20:41:51 -0000
@@ -71,7 +71,7 @@ static VOID (WINAPI *pImmNotifyIME)(HIMC
/*
* here are the functions that sort of marshall calls into IMM32.DLL
*/
-static void LoadImmDll()
+static void LoadImmDll(void)
{
hImmDll = LoadLibraryA("imm32.dll");
More information about the wine-patches
mailing list