Commit 4d52a421 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Made some functions static.

parent a2f0cb85
......@@ -172,10 +172,10 @@ static void test_comboboxex(void) {
}
LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(msg) {
case WM_DESTROY:
PostQuitMessage(0);
break;
......
......@@ -33,16 +33,16 @@ typedef struct tagEXPECTEDNOTIFY
typedef LRESULT (*CUSTOMDRAWPROC)(int n, NMCUSTOMDRAW *nm);
CUSTOMDRAWPROC g_CustomDrawProc;
int g_CustomDrawCount;
DRAWITEMSTRUCT g_DrawItem;
BOOL g_DrawItemReceived;
static CUSTOMDRAWPROC g_CustomDrawProc;
static int g_CustomDrawCount;
static DRAWITEMSTRUCT g_DrawItem;
static BOOL g_DrawItemReceived;
EXPECTEDNOTIFY expectedNotify[10];
INT nExpectedNotify = 0;
INT nReceivedNotify = 0;
INT unexpectedNotify[10];
INT nUnexpectedNotify = 0;
static EXPECTEDNOTIFY expectedNotify[10];
static INT nExpectedNotify = 0;
static INT nReceivedNotify = 0;
static INT unexpectedNotify[10];
static INT nUnexpectedNotify = 0;
static HWND hHeaderParentWnd;
static HWND hWndHeader;
......@@ -611,7 +611,7 @@ static void run_customdraw_scenario(CUSTOMDRAWPROC proc)
g_CustomDrawProc = NULL;
}
void test_customdraw()
static void test_customdraw(void)
{
int i;
HDITEM item;
......@@ -735,7 +735,7 @@ static void test_header_order (void)
DestroyWindow(hWndHeader);
}
LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
DRAWITEMSTRUCT *di;
switch(msg) {
......
......@@ -28,7 +28,7 @@
#include "wine/test.h"
void test_monthcal(void)
static void test_monthcal(void)
{
HWND hwnd;
SYSTEMTIME st[2], st1[2];
......
......@@ -29,14 +29,14 @@
#include "wine/test.h"
HWND hProgressParentWnd, hProgressWnd;
static HWND hProgressParentWnd, hProgressWnd;
static const char progressTestClass[] = "ProgressBarTestClass";
LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
static LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(msg) {
case WM_DESTROY:
PostQuitMessage(0);
break;
......@@ -52,7 +52,7 @@ static WNDPROC progress_wndproc;
static BOOL erased;
static RECT last_paint_rect;
LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
static LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (msg == WM_PAINT)
{
......
......@@ -32,11 +32,11 @@
#include "wine/test.h"
HWND hMainWnd;
BOOL g_fBlockHotItemChange;
BOOL g_fReceivedHotItemChange;
BOOL g_fExpectedHotItemOld;
BOOL g_fExpectedHotItemNew;
static HWND hMainWnd;
static BOOL g_fBlockHotItemChange;
static BOOL g_fReceivedHotItemChange;
static BOOL g_fExpectedHotItemOld;
static BOOL g_fExpectedHotItemNew;
#define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \
val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \
......@@ -147,7 +147,7 @@ static void rebuild_toolbar(HWND *hToolbar)
ok(SendMessage(*hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n");
}
void rebuild_toolbar_with_buttons(HWND *hToolbar)
static void rebuild_toolbar_with_buttons(HWND *hToolbar)
{
TBBUTTON buttons[5];
rebuild_toolbar(hToolbar);
......@@ -393,7 +393,7 @@ static void test_add_bitmap(void)
"Too many string in table\n"); \
}
void test_add_string()
static void test_add_string(void)
{
LPCSTR test1 = "a\0b\0";
LPCSTR test2 = "|a|b||\0";
......@@ -456,7 +456,7 @@ static void expect_hot_notify(int idold, int idnew)
ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); \
g_fExpectedHotItemOld = g_fExpectedHotItemNew = 0;
void test_hotitem()
static void test_hotitem(void)
{
HWND hToolbar = NULL;
TBBUTTONINFO tbinfo;
......@@ -551,7 +551,7 @@ void test_hotitem()
#if 0 /* use this to generate more tests*/
void dump_sizes(HWND hToolbar)
static void dump_sizes(HWND hToolbar)
{
SIZE sz;
RECT r;
......@@ -583,7 +583,7 @@ typedef struct
RECT rcButtons[100];
} tbsize_result_t;
tbsize_result_t tbsize_results[] =
static tbsize_result_t tbsize_results[] =
{
{ {0, 0, 672, 26}, {100, 22}, 5, {
{ 0, 2, 23, 24}, { 23, 2, 46, 24}, { 46, 2, 54, 24},
......@@ -687,7 +687,7 @@ tbsize_result_t tbsize_results[] =
}, },
};
int tbsize_numtests = 0;
static int tbsize_numtests = 0;
#define check_sizes_todo(todomask) { \
RECT rc; \
......@@ -714,22 +714,22 @@ int tbsize_numtests = 0;
#endif
TBBUTTON buttons1[] = {
static TBBUTTON buttons1[] = {
{0, 10, TBSTATE_WRAP|TBSTATE_ENABLED, 0, {0, }, 0, -1},
{0, 11, 0, 0, {0, }, 0, -1},
};
TBBUTTON buttons2[] = {
static TBBUTTON buttons2[] = {
{0, 20, TBSTATE_ENABLED, 0, {0, }, 0, -1},
{0, 21, TBSTATE_ENABLED, 0, {0, }, 0, -1},
};
TBBUTTON buttons3[] = {
static TBBUTTON buttons3[] = {
{0, 30, TBSTATE_ENABLED, 0, {0, }, 0, 0},
{0, 31, TBSTATE_ENABLED, 0, {0, }, 0, 1},
{0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1},
{0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)"Tst"}
};
void test_sizes()
static void test_sizes(void)
{
HWND hToolbar = NULL;
int style;
......
......@@ -132,10 +132,10 @@ static void DoTest2(void)
ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n");
}
LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(msg) {
case WM_CREATE:
{
hTree = CreateWindowExA(WS_EX_CLIENTEDGE, WC_TREEVIEWA, NULL, WS_CHILD|WS_VISIBLE|
......
......@@ -256,7 +256,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256
pItem[0].a.s.uBidiLevel);
}
void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256])
static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256])
{
HRESULT hr;
SCRIPT_CACHE psc = NULL;
......@@ -312,7 +312,7 @@ void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256])
}
void test_ScriptGetFontProperties(void)
static void test_ScriptGetFontProperties(void)
{
HRESULT hr;
HDC hdc;
......@@ -388,7 +388,7 @@ void test_ScriptGetFontProperties(void)
DestroyWindow(hwnd);
}
void test_ScriptTextOut(void)
static void test_ScriptTextOut(void)
{
HRESULT hr;
HWND hwnd;
......@@ -700,7 +700,7 @@ static void test_ScriptString(void)
}
}
void test_ScriptStringXtoCP_CPtoX(HDC hdc)
static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
{
/*****************************************************************************************
*
......@@ -872,10 +872,10 @@ void test_ScriptStringXtoCP_CPtoX(HDC hdc)
* ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail
*/
todo_wine ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr);
}
}
}
void test_ScriptCacheGetHeight(HDC hdc)
static void test_ScriptCacheGetHeight(HDC hdc)
{
HRESULT hr;
SCRIPT_CACHE sc = NULL;
......@@ -898,7 +898,7 @@ void test_ScriptCacheGetHeight(HDC hdc)
ok(height > 0, "expected height > 0\n");
}
void test_ScriptGetGlyphABCWidth(HDC hdc)
static void test_ScriptGetGlyphABCWidth(HDC hdc)
{
HRESULT hr;
LOGFONTA lf;
......@@ -927,7 +927,7 @@ void test_ScriptGetGlyphABCWidth(HDC hdc)
ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);
}
void test_ScriptLayout(void)
static void test_ScriptLayout(void)
{
HRESULT hr;
static const BYTE levels[][5] =
......
......@@ -287,7 +287,7 @@ const char * wave_open_flags(DWORD flags)
return msg;
}
const char * wave_header_flags(DWORD flags)
static const char * wave_header_flags(DWORD flags)
{
#define WHDR_MASK (WHDR_BEGINLOOP|WHDR_DONE|WHDR_ENDLOOP|WHDR_INQUEUE|WHDR_PREPARED)
static char msg[1024];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment