widl [2/3]: Remove static keywords from tests, they were hiding bugs

Dan Hipschman dsh at linux.ucla.edu
Fri Sep 21 18:18:11 CDT 2007


This patch removes some static specifiers from the rpcrt4 tests, as
these were hiding some errors with conformant arrays.  These tests
will now pass correctly on both wine and windows, with patch [1/3]
installed.

I'm still working on a problem with the square_test_us test, so I'm
leaving the static specifier on p1 there until I get that seperate
problem fixed.

---
 dlls/rpcrt4/tests/server.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c
index cdec58b..47ff9e8 100644
--- a/dlls/rpcrt4/tests/server.c
+++ b/dlls/rpcrt4/tests/server.c
@@ -416,14 +416,14 @@ run_client(const char *test)
 static void
 basic_tests(void)
 {
-  static char string[] = "I am a string";
-  static int f[5] = {1, 3, 0, -2, -4};
-  static vector_t a = {1, 3, 7};
-  static vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2;
-  static pvectors_t pvecs = {&vec1, &pvec2};
-  static sp_inner_t spi = {42};
-  static sp_t sp = {-13, &spi};
-  static aligns_t aligns = {3, 4, 5, 6.0};
+  char string[] = "I am a string";
+  int f[5] = {1, 3, 0, -2, -4};
+  vector_t a = {1, 3, 7};
+  vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2;
+  pvectors_t pvecs = {&vec1, &pvec2};
+  sp_inner_t spi = {42};
+  sp_t sp = {-13, &spi};
+  aligns_t aligns = {3, 4, 5, 6.0};
   pints_t pints;
   ptypes_t ptypes;
   padded_t padded;
@@ -660,10 +660,10 @@ us_t_UserFree(ULONG *flags, us_t *pus)
 static void
 pointer_tests(void)
 {
-  static int a[] = {1, 2, 3, 4};
+  int a[] = {1, 2, 3, 4};
   static char p1[] = "11";
   test_list_t *list = make_list(make_list(make_list(null_list())));
-  static test_us_t tus = {{p1}};
+  test_us_t tus = {{p1}};
   int *pa[4];
 
   ok(test_list_length(list) == 3, "RPC test_list_length\n");
@@ -687,14 +687,14 @@ pointer_tests(void)
 static void
 array_tests(void)
 {
-  static const char str1[25] = "Hello";
-  static int m[2][3][4] =
+  const char str1[25] = "Hello";
+  int m[2][3][4] =
   {
     {{1, 2, 3, 4}, {-1, -3, -5, -7}, {0, 2, 4, 6}},
     {{1, -2, 3, -4}, {2, 3, 5, 7}, {-4, -1, -14, 4114}}
   };
-  static int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-  static vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}};
+  int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}};
   cps_t cps;
   cpsc_t cpsc;
   cs_t *cs;



More information about the wine-patches mailing list