October 2010 - Wine-Commits

Alexandre Julliard : riched20/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 95c1bd4da9ca94f52fe4eef7d17608a7c72bc243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c1bd4da9ca94f52fe4eef7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:40:29 2010 +0200 riched20/tests: Make some variables static. --- dlls/riched20/tests/editor.c | 12 ++++++------ dlls/riched32/tests/editor.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3422536..efd2023 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -155,7 +155,7 @@ struct find_s { }; -struct find_s find_tests[] = { +static struct find_s find_tests[] = { /* Find in empty text */ {0, -1, "foo", FR_DOWN, -1}, {0, -1, "foo", 0, -1}, @@ -164,7 +164,7 @@ struct find_s find_tests[] = { {5, 20, "foo", FR_DOWN, -1} }; -struct find_s find_tests2[] = { +static struct find_s find_tests2[] = { /* No-result find */ {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1}, {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1}, @@ -2446,10 +2446,10 @@ static void test_EM_SCROLL(void) DestroyWindow(hwndRichEdit); } -unsigned int recursionLevel = 0; -unsigned int WM_SIZE_recursionLevel = 0; -BOOL bailedOutOfRecursion = FALSE; -LRESULT (WINAPI *richeditProc)(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); +static unsigned int recursionLevel = 0; +static unsigned int WM_SIZE_recursionLevel = 0; +static BOOL bailedOutOfRecursion = FALSE; +static LRESULT (WINAPI *richeditProc)(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); static LRESULT WINAPI RicheditStupidOverrideProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0fc913c..6b1f721 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -566,7 +566,7 @@ struct find_s { }; -struct find_s find_tests[] = { +static struct find_s find_tests[] = { /* Find in empty text */ {0, -1, "foo", FR_DOWN, -1}, {0, -1, "foo", 0, -1}, @@ -575,7 +575,7 @@ struct find_s find_tests[] = { {5, 20, "foo", FR_DOWN, -1} }; -struct find_s find_tests2[] = { +static struct find_s find_tests2[] = { /* No-result find */ {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1}, {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1}, @@ -642,7 +642,7 @@ struct find_s find_tests2[] = { {4, -1, "INEW", 0, 10}, }; -struct find_s find_tests3[] = { +static struct find_s find_tests3[] = { /* Searching for end of line characters */ {0, -1, "t\r\r\ns", FR_DOWN | FR_MATCHCASE, 4}, {6, -1, "\r\n", FR_DOWN | FR_MATCHCASE, 6},

1 0

Alexandre Julliard : taskmgr: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: e179c20b10c639043abb6342416df44379eb16a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e179c20b10c639043abb63424… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:38:24 2010 +0200 taskmgr: Make some variables static. --- programs/taskmgr/column.c | 50 ++++++++++++++++++++++---------------------- programs/taskmgr/endproc.c | 6 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 4216d75..688771d 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -35,31 +35,31 @@ UINT ColumnDataHints[25]; /* Column Headers; Begin */ -WCHAR wszImageName[255]; -WCHAR wszPID[255]; -WCHAR wszUserName[255]; -WCHAR wszSessionID[255]; -WCHAR wszCPU[255]; -WCHAR wszCPUTime[255]; -WCHAR wszMemUsage[255]; -WCHAR wszPeakMemUsage[255]; -WCHAR wszMemDelta[255]; -WCHAR wszPageFaults[255]; -WCHAR wszPFDelta[255]; -WCHAR wszVMSize[255]; -WCHAR wszPagedPool[255]; -WCHAR wszNPPool[255]; -WCHAR wszBasePri[255]; -WCHAR wszHandles[255]; -WCHAR wszThreads[255]; -WCHAR wszUSERObjects[255]; -WCHAR wszGDIObjects[255]; -WCHAR wszIOReads[255]; -WCHAR wszIOWrites[255]; -WCHAR wszIOOther[255]; -WCHAR wszIOReadBytes[255]; -WCHAR wszIOWriteBytes[255]; -WCHAR wszIOOtherBytes[255]; +static WCHAR wszImageName[255]; +static WCHAR wszPID[255]; +static WCHAR wszUserName[255]; +static WCHAR wszSessionID[255]; +static WCHAR wszCPU[255]; +static WCHAR wszCPUTime[255]; +static WCHAR wszMemUsage[255]; +static WCHAR wszPeakMemUsage[255]; +static WCHAR wszMemDelta[255]; +static WCHAR wszPageFaults[255]; +static WCHAR wszPFDelta[255]; +static WCHAR wszVMSize[255]; +static WCHAR wszPagedPool[255]; +static WCHAR wszNPPool[255]; +static WCHAR wszBasePri[255]; +static WCHAR wszHandles[255]; +static WCHAR wszThreads[255]; +static WCHAR wszUSERObjects[255]; +static WCHAR wszGDIObjects[255]; +static WCHAR wszIOReads[255]; +static WCHAR wszIOWrites[255]; +static WCHAR wszIOOther[255]; +static WCHAR wszIOReadBytes[255]; +static WCHAR wszIOWriteBytes[255]; +static WCHAR wszIOOtherBytes[255]; /* Column Headers; End */ static void load_column_headers(void) diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 5129ec3..10a8cd4 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -33,9 +33,9 @@ #include "taskmgr.h" #include "perfdata.h" -WCHAR wszWarnMsg[511]; -WCHAR wszWarnTitle[255]; -WCHAR wszUnable2Terminate[255]; +static WCHAR wszWarnMsg[511]; +static WCHAR wszWarnTitle[255]; +static WCHAR wszUnable2Terminate[255]; static void load_message_strings(void) {

1 0

Alexandre Julliard : shlwapi/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: eb2d556ec89ded1d5470244dd7e94ae3609b34a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2d556ec89ded1d5470244dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:37:34 2010 +0200 shlwapi/tests: Make some variables static. --- dlls/shlwapi/tests/clsid.c | 2 +- dlls/shlwapi/tests/path.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 98a8c6d..85550fc 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -40,7 +40,7 @@ static BOOL (WINAPI *pSHLWAPI_269)(LPCSTR, CLSID *) = 0; static DWORD (WINAPI *pSHLWAPI_23)(REFGUID, LPSTR, INT) = 0; /* GUIDs to test */ -const GUID * TEST_guids[] = { +static const GUID * TEST_guids[] = { &CLSID_ShellDesktop, &CLSID_ShellLink, &CATID_BrowsableShellExt, diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 3e83a45..9b4b15e 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -37,7 +37,7 @@ static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); /* ################ */ -struct { +static const struct { const char *url; const char *path; DWORD ret; @@ -106,7 +106,7 @@ static struct { {NULL, FALSE} }; -struct { +static const struct { const char *path; const char *result; } TEST_PATH_UNQUOTE_SPACES[] = {

1 0

Alexandre Julliard : setupapi/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 5c4c6544ae1f176ffe71c4924bb45ad8f50ece3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4c6544ae1f176ffe71c4924… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:37:28 2010 +0200 setupapi/tests: Make some variables static. --- dlls/setupapi/tests/query.c | 4 ++-- dlls/setupapi/tests/stringtable.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 6e956a2..b77827c 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -23,8 +23,8 @@ #include <setupapi.h> #include "wine/test.h" -CHAR CURR_DIR[MAX_PATH]; -CHAR WIN_DIR[MAX_PATH]; +static CHAR CURR_DIR[MAX_PATH]; +static CHAR WIN_DIR[MAX_PATH]; static void get_directories(void) { diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 2b7b77a..8048f8a 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -53,7 +53,7 @@ static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWST static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); #endif -HMODULE hdll; +static HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0}; static WCHAR String[] = {'S','t','r','i','n','g',0}; static WCHAR foo[] = {'f','o','o',0};

1 0

Alexandre Julliard : ntdll/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: be94563670cf5fd4aa6530561287a7d7d96b1030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be94563670cf5fd4aa6530561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:37:03 2010 +0200 ntdll/tests: Make some variables static. --- dlls/ntdll/tests/change.c | 12 ++++-------- dlls/ntdll/tests/directory.c | 2 +- dlls/ntdll/tests/file.c | 6 +++--- dlls/ntdll/tests/time.c | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index ed7f22c..297af9e 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -27,13 +27,11 @@ #include <stdio.h> #include "wine/test.h" -typedef NTSTATUS (WINAPI *fnNtNotifyChangeDirectoryFile)( +static NTSTATUS (WINAPI *pNtNotifyChangeDirectoryFile)( HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID, PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); -fnNtNotifyChangeDirectoryFile pNtNotifyChangeDirectoryFile; -typedef NTSTATUS (WINAPI *fnNtCancelIoFile)(HANDLE,PIO_STATUS_BLOCK); -fnNtCancelIoFile pNtCancelIoFile; +static NTSTATUS (WINAPI *pNtCancelIoFile)(HANDLE,PIO_STATUS_BLOCK); static void test_ntncdf(void) @@ -321,10 +319,8 @@ START_TEST(change) return; } - pNtNotifyChangeDirectoryFile = (fnNtNotifyChangeDirectoryFile) - GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile"); - pNtCancelIoFile = (fnNtCancelIoFile) - GetProcAddress(hntdll, "NtCancelIoFile"); + pNtNotifyChangeDirectoryFile = (void *)GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile"); + pNtCancelIoFile = (void *)GetProcAddress(hntdll, "NtCancelIoFile"); if (!pNtNotifyChangeDirectoryFile || !pNtCancelIoFile) { diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index a77a4b4..bc4ad39 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -50,7 +50,7 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirection)( BOOLEAN enable ); static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG *old_value ); /* The attribute sets to test */ -struct testfile_s { +static struct testfile_s { int todo; /* set if it doesn't work on wine yet */ const DWORD attr; /* desired attribute */ const char *name; /* filename to use */ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c1f1c48..99a608b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -112,9 +112,9 @@ static HANDLE create_temp_file( ULONG flags ) #define CKEY_FIRST 0x1030341 #define CKEY_SECOND 0x132E46 -ULONG_PTR completionKey; -IO_STATUS_BLOCK ioSb; -ULONG_PTR completionValue; +static ULONG_PTR completionKey; +static IO_STATUS_BLOCK ioSb; +static ULONG_PTR completionValue; static ULONG get_pending_msgs(HANDLE h) { diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 16530c4..ff80b84 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -39,7 +39,7 @@ static inline int IsLeapYear(int Year) } /* start time of the tests */ -TIME_FIELDS tftest = {1889,12,31,23,59,59,0,0}; +static TIME_FIELDS tftest = {1889,12,31,23,59,59,0,0}; static void test_pRtlTimeToTimeFields(void) {

1 0

Alexandre Julliard : ole32/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: bc8e70c0891790fc1144cb416aaa88877165d66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8e70c0891790fc1144cb416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:37:14 2010 +0200 ole32/tests: Make some variables static. --- dlls/ole32/tests/clipboard.c | 6 +++--- dlls/ole32/tests/compobj.c | 10 +++++----- dlls/ole32/tests/marshal.c | 6 +++--- dlls/ole32/tests/ole2.c | 4 ++-- dlls/ole32/tests/propvariant.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 626d244..1afa0e3 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -387,9 +387,9 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) return S_OK; } -const char *cmpl_stm_data = "complex stream"; -const char *cmpl_text_data = "complex text"; -const WCHAR device_name[] = {'m','y','d','e','v',0}; +static const char *cmpl_stm_data = "complex stream"; +static const char *cmpl_text_data = "complex text"; +static const WCHAR device_name[] = {'m','y','d','e','v',0}; static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) { diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9d469b4..2d67b1e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -36,11 +36,11 @@ #include "wine/test.h" /* functions that are not present on all versions of Windows */ -HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); -HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); -HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); -HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); -HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); +static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); +static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); +static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); +static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); +static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 20b0d8b..ef101ae 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -38,7 +38,7 @@ DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); /* functions that are not present on all versions of Windows */ -HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); +static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); /* helper macros to make tests a bit leaner */ #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -1845,7 +1845,7 @@ static const IClassFactoryVtbl TestREClassFactory_Vtbl = Test_IClassFactory_LockServer }; -IClassFactory TestRE_ClassFactory = { &TestREClassFactory_Vtbl }; +static IClassFactory TestRE_ClassFactory = { &TestREClassFactory_Vtbl }; static LRESULT CALLBACK window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -2011,7 +2011,7 @@ static IClassFactoryVtbl TestMsgClassFactory_Vtbl = Test_IClassFactory_LockServer }; -IClassFactory TestMsg_ClassFactory = { &TestMsgClassFactory_Vtbl }; +static IClassFactory TestMsg_ClassFactory = { &TestMsgClassFactory_Vtbl }; static void test_call_from_message(void) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 3db2cb5..cd83a3b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -55,8 +55,8 @@ struct expected_method static const struct expected_method *expected_method_list; static FORMATETC *g_expected_fetc = NULL; -BOOL g_showRunnable = TRUE; -BOOL g_isRunning = TRUE; +static BOOL g_showRunnable = TRUE; +static BOOL g_isRunning = TRUE; #define CHECK_EXPECTED_METHOD(method_name) \ do { \ diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 380dc14..4d34117 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -32,7 +32,7 @@ #define PROP_V1A 2 #define PROP_TODO 0x80 -struct valid_mapping +static const struct valid_mapping { BYTE simple; BYTE with_array;

1 0

Alexandre Julliard : user32/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: dfab8824c5617bc39ccff26ee4dd056082cb0d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfab8824c5617bc39ccff26ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:37:44 2010 +0200 user32/tests: Make some variables static. --- dlls/user32/tests/input.c | 6 +++--- dlls/user32/tests/listbox.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d82ef3c..e0d5b42 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -414,7 +414,7 @@ struct message { LPARAM lParam; /* expected value of lParam */ }; -struct sendinput_test_s { +static const struct sendinput_test_s { WORD wVk; DWORD dwFlags; BOOL _todo_wine; @@ -674,10 +674,10 @@ static struct message sent_messages[MAXKEYMESSAGES]; static UINT sent_messages_cnt; /* Verify that only specified key state transitions occur */ -static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_test_s *test) +static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, const struct sendinput_test_s *test) { int i, failcount = 0; - struct transition_s *t = test->expected_transitions; + const struct transition_s *t = test->expected_transitions; UINT actual_cnt = 0; const struct message *expected = test->expected_messages; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 06c41d4..2559be5 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -996,8 +996,8 @@ static void test_listbox_LB_DIR(void) DeleteFileA( "wtest1.tmp.c" ); } -HWND g_listBox; -HWND g_label; +static HWND g_listBox; +static HWND g_label; #define ID_TEST_LABEL 1001 #define ID_TEST_LISTBOX 1002

1 0

Alexandre Julliard : kernel32/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 7064e8838c8fdde9cb3cd523dd882826f65edebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7064e8838c8fdde9cb3cd523d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:36:35 2010 +0200 kernel32/tests: Make some variables static. --- dlls/kernel32/tests/change.c | 6 ++---- dlls/kernel32/tests/pipe.c | 2 +- dlls/kernel32/tests/resource.c | 4 ++-- dlls/kernel32/tests/thread.c | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 08d1417..49dbb88 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -369,9 +369,8 @@ static void test_ffcnMultipleThreads(void) ok( r == TRUE, "failed to remove dir\n"); } -typedef BOOL (WINAPI *fnReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, +static BOOL (WINAPI *pReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); -fnReadDirectoryChangesW pReadDirectoryChangesW; static void test_readdirectorychanges(void) { @@ -874,8 +873,7 @@ static void test_ffcn_directory_overlap(void) START_TEST(change) { HMODULE hkernel32 = GetModuleHandle("kernel32"); - pReadDirectoryChangesW = (fnReadDirectoryChangesW) - GetProcAddress(hkernel32, "ReadDirectoryChangesW"); + pReadDirectoryChangesW = (void *)GetProcAddress(hkernel32, "ReadDirectoryChangesW"); test_ffcnMultipleThreads(); /* The above function runs a test that must occur before FindCloseChangeNotification is run in the diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f5a56c6..b38da23 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -392,7 +392,7 @@ static DWORD CALLBACK alarmThreadMain(LPVOID arg) return 1; } -HANDLE hnp = INVALID_HANDLE_VALUE; +static HANDLE hnp = INVALID_HANDLE_VALUE; /** Trivial byte echo server - disconnects after each session */ static DWORD CALLBACK serverThreadMain1(LPVOID arg) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 0927877..a85e6d2 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -26,11 +26,11 @@ static const char filename[] = "test_.exe"; static DWORD GLE; -enum { +enum constants { page_size = 0x1000, rva_rsrc_start = page_size * 3, max_sections = 3 -} constants; +}; /* rodata @ [0x1000-0x3000) */ static const IMAGE_SECTION_HEADER sh_rodata_1 = diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 19e695b..c285b01 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -146,7 +146,7 @@ static void cleanup_thread_sync_helpers(void) CloseHandle(stop_event); } -DWORD tlsIndex; +static DWORD tlsIndex; typedef struct { int threadnum; @@ -157,7 +157,7 @@ typedef struct { /* WinME supports OpenThread but doesn't know about access restrictions so we require them to be either completely ignored or always obeyed. */ -INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */ +static INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */ #define obey_ar(x) \ (obeying_ars == 0 \ ? ((x) \

1 0

Alexandre Julliard : msi/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: d1d1d0205d5f99c70a8bb807ee116c07594a8f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d1d0205d5f99c70a8bb807e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:36:43 2010 +0200 msi/tests: Make some variables static. --- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/package.c | 2 +- dlls/msi/tests/suminfo.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b3fe3b8..8f6b1ec 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8230,7 +8230,7 @@ static void test_select_with_tablenames(void) DeleteFileA(msifile); } -UINT ordervals[6][3] = +static const UINT ordervals[6][3] = { { MSI_NULL_INTEGER, 12, 13 }, { 1, 2, 3 }, diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 11b1de1..f232b50 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -7661,7 +7661,7 @@ error: RemoveDirectory("msitest"); } -struct sourcepathmap +static const struct sourcepathmap { BOOL sost; /* shortone\shorttwo */ BOOL solt; /* shortone\longtwo */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7efb6a2..948922f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -31,7 +31,7 @@ #include "wine/test.h" static const char msifile[] = "winetest-package.msi"; -char CURR_DIR[MAX_PATH]; +static char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 07202a3..76dac57 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -63,7 +63,7 @@ #define PID_MSISOURCE PID_WORDCOUNT #define PID_MSIRESTRICT PID_CHARCOUNT -const char *msifile = "winetest-suminfo.msi"; +static const char *msifile = "winetest-suminfo.msi"; static const WCHAR msifileW[] = { 'w','i','n','e','t','e','s','t','-','s','u','m','i','n','f','o','.','m','s','i',0 };

1 0

Alexandre Julliard : netapi32/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 7c2de56ccde2f1d6858408f8dc1443d987da0737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2de56ccde2f1d6858408f8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:36:54 2010 +0200 netapi32/tests: Make some variables static. --- dlls/netapi32/tests/access.c | 4 ++-- dlls/netapi32/tests/wksta.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 2f29684..b721c19 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -29,8 +29,8 @@ #include "wine/test.h" -WCHAR user_name[UNLEN + 1]; -WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +static WCHAR user_name[UNLEN + 1]; +static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; static const WCHAR sNonexistentUser[] = {'N','o','n','e','x','i','s','t','e','n','t',' ', 'U','s','e','r',0}; diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index c5929de..fff5b48 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -39,8 +39,8 @@ static NET_API_STATUS (WINAPI *pNetWkstaUserGetInfo)(LPWSTR,DWORD,PBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaTransportEnum)(LPWSTR,DWORD,LPBYTE*, DWORD,LPDWORD,LPDWORD,LPDWORD)=NULL; -WCHAR user_name[UNLEN + 1]; -WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +static WCHAR user_name[UNLEN + 1]; +static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; static int init_wksta_tests(void) {

1 0