Alexandre Julliard : comctl32/tests: Make some variables static.
Alexandre Julliard
julliard at winehq.org
Fri Oct 1 11:38:39 CDT 2010
Module: wine
Branch: master
Commit: 55676e84ed26d68e1ed5c59764e0f21e10983795
URL: http://source.winehq.org/git/wine.git/?a=commit;h=55676e84ed26d68e1ed5c59764e0f21e10983795
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Oct 1 13:35:49 2010 +0200
comctl32/tests: Make some variables static.
---
dlls/comctl32/tests/rebar.c | 10 +++++-----
dlls/comctl32/tests/trackbar.c | 2 +-
dlls/comctl32/tests/treeview.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index d5f27b9..98fd4e5 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -30,7 +30,7 @@
#include "wine/test.h"
-RECT height_change_notify_rect;
+static RECT height_change_notify_rect;
static HWND hMainWnd;
@@ -182,7 +182,7 @@ typedef struct {
rbband_result_t bands[50];
} rbsize_result_t;
-rbsize_result_t rbsize_results[] = {
+static const rbsize_result_t rbsize_results[] = {
{ {0, 0, 672, 0}, 0, 0, {0, }, 0, {{{0, 0, 0, 0}, 0, 0},
}, },
{ {0, 0, 672, 4}, 4, 1, {4, }, 1, {
@@ -299,7 +299,7 @@ static int rbsize_numtests = 0;
RECT rc; \
REBARBANDINFO rbi; \
int count, i/*, mask=(todomask)*/; \
- rbsize_result_t *res = &rbsize_results[rbsize_numtests]; \
+ const rbsize_result_t *res = &rbsize_results[rbsize_numtests]; \
assert(rbsize_numtests < sizeof(rbsize_results)/sizeof(rbsize_results[0])); \
GetClientRect(hRebar, &rc); \
check_rect("client", rc, res->rcClient); \
@@ -547,7 +547,7 @@ typedef struct {
BOOL heightNotify;
} rbresize_test_result_t;
-rbresize_test_result_t resize_results[] = {
+static const rbresize_test_result_t resize_results[] = {
/* style 00000001 */
{{0, 2, 672, 2}, 0, FALSE},
{{0, 2, 672, 22}, 1, TRUE},
@@ -673,7 +673,7 @@ static int resize_numtests = 0;
#define comment(fmt, arg1)
#define check_client() { \
RECT r; \
- rbresize_test_result_t *res = &resize_results[resize_numtests++]; \
+ const rbresize_test_result_t *res = &resize_results[resize_numtests++]; \
assert(resize_numtests <= sizeof(resize_results)/sizeof(resize_results[0])); \
GetWindowRect(hRebar, &r); \
MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); \
diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 68261d8..ac67d50 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -30,7 +30,7 @@
#define PARENT_SEQ_INDEX 0
#define TRACKBAR_SEQ_INDEX 1
-HWND hWndParent;
+static HWND hWndParent;
static struct msg_sequence *sequences[NUM_MSG_SEQUENCE];
diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index 572ec9b..906a12d 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -33,7 +33,7 @@
#include "v6util.h"
#include "msg.h"
-const char *TEST_CALLBACK_TEXT = "callback_text";
+static const char *TEST_CALLBACK_TEXT = "callback_text";
#define NUM_MSG_SEQUENCES 2
#define TREEVIEW_SEQ_INDEX 0
More information about the wine-cvs
mailing list