Initialization of static variables

[Gregg Mattinson]

Changelog: dlls/advapi32/registry.c memory/registry.c
 - Forte does not allow initialization of const static variables with function
   parameters (which are non-static by definition)

Gregg Mattinson
Co-op Developer
Sun Microsystems of Canada

-------------- next part --------------
Index: dlls/advapi32/registry.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/advapi32/registry.c,v
retrieving revision 1.1
diff -u -r1.1 registry.c
--- /tmp/T0AHaWrF	Tue Jul  2 13:50:00 2002
+++ registry.c	Mon Jun 24 14:46:09 2002
@@ -793,7 +793,7 @@
     DWORD total_size;
     char buffer[256], *buf_ptr = buffer;
     KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
-    static const int info_size = info->Data - (UCHAR *)info;
+    const int info_size = info->Data - (UCHAR *)info;
 
     TRACE("(0x%x,%s,%p,%p,%p,%p=%ld)\n",
           hkey, debugstr_w(name), reserved, type, data, count, count ? *count : 0 );
@@ -860,7 +860,7 @@
     DWORD total_size;
     char buffer[256], *buf_ptr = buffer;
     KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
-    static const int info_size = info->Data - (UCHAR *)info;
+    const int info_size = info->Data - (UCHAR *)info;
 
     TRACE("(0x%x,%s,%p,%p,%p,%p=%ld)\n",
           hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 );
@@ -1008,7 +1008,7 @@
     DWORD total_size;
     char buffer[256], *buf_ptr = buffer;
     KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
-    static const int info_size = (char *)info->Name - (char *)info;
+    const int info_size = (char *)info->Name - (char *)info;
 
     TRACE("(%x,%ld,%p,%p,%p,%p,%p,%p)\n",
           hkey, index, value, val_count, reserved, type, data, count );
@@ -1089,7 +1089,7 @@
     DWORD total_size;
     char buffer[256], *buf_ptr = buffer;
     KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
-    static const int info_size = (char *)info->Name - (char *)info;
+    const int info_size = (char *)info->Name - (char *)info;
 
     TRACE("(%x,%ld,%p,%p,%p,%p,%p,%p)\n",
           hkey, index, value, val_count, reserved, type, data, count );
Index: memory/registry.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/memory/registry.c,v
retrieving revision 1.1
diff -u -r1.1 registry.c
--- /tmp/T0F3aqQF	Tue Jul  2 13:53:39 2002
+++ registry.c	Mon Jun 24 15:14:51 2002
@@ -388,7 +388,7 @@
     DWORD total_size;
     char buffer[256], *buf_ptr = buffer;
     KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
-    static const int info_size = info->Data - (UCHAR *)info;
+    const int info_size = info->Data - (UCHAR *)info;
 
     TRACE("(0x%x,%s,%p,%p,%p,%p=%ld)\n",
           hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 );
@@ -500,7 +500,7 @@
     DWORD total_size;
     char buffer[256], *buf_ptr = buffer;
     KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
-    static const int info_size = (char *)info->Name - (char *)info;
+    const int info_size = (char *)info->Name - (char *)info;
 
     TRACE("(%x,%ld,%p,%p,%p,%p,%p,%p)\n",
           hkey, index, value, val_count, reserved, type, data, count );