[ekohl] 20525: Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and MIDL_STUB_DESC.

Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and
MIDL_STUB_DESC.
Modified: trunk/reactos/tools/widl/ChangeLog
Modified: trunk/reactos/tools/widl/client.c
Modified: trunk/reactos/tools/widl/server.c
  _____

Modified: trunk/reactos/tools/widl/ChangeLog
--- trunk/reactos/tools/widl/ChangeLog	2006-01-01 20:56:01 UTC (rev
20524)
+++ trunk/reactos/tools/widl/ChangeLog	2006-01-01 20:59:39 UTC (rev
20525)
@@ -1,5 +1,13 @@

ChangeLog

[phone] ekohl
+
+   tools/widl/client.c
+   tools/widl/server.c
+
+- Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and
+  MIDL_STUB_DESC variables.
+
 2005-12-05 ekohl

tools/widl/widl.c
  _____

Modified: trunk/reactos/tools/widl/client.c
--- trunk/reactos/tools/widl/client.c	2006-01-01 20:56:01 UTC (rev
20524)
+++ trunk/reactos/tools/widl/client.c	2006-01-01 20:59:39 UTC (rev
20525)
@@ -304,7 +304,7 @@

unsigned int type_offset = 2;
     int in_attr, out_attr;

-    print_client("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString
=\n");
+    print_client("static const MIDL_PROC_FORMAT_STRING
__MIDL_ProcFormatString =\n");
     print_client("{\n");
     indent++;
     print_client("0,\n");
@@ -429,7 +429,7 @@
     int ptr_attr, ref_attr, unique_attr;
     void *sizeis_attr;

-    print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString
=\n");
+    print_client("static const MIDL_TYPE_FORMAT_STRING
__MIDL_TypeFormatString =\n");
     print_client("{\n");
     indent++;
     print_client("0,\n");
@@ -1782,7 +1782,7 @@

static void write_stubdescdecl(type_t *iface)
 {
-    print_client("extern const MIDL_STUB_DESC %s_StubDesc;\n",
iface->name);
+    print_client("static const MIDL_STUB_DESC %s_StubDesc;\n",
iface->name);
     fprintf(client, "\n");
 }

@@ -1791,7 +1791,7 @@
 {
     char *implicit_handle = get_attrp(iface->attrs,
ATTR_IMPLICIT_HANDLE);

-    print_client("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);
+    print_client("static const MIDL_STUB_DESC %s_StubDesc =\n",
iface->name);
     print_client("{\n");
     indent++;
     print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n",
iface->name);
@@ -1956,8 +1956,8 @@
     write_formatdesc("TYPE");
     write_formatdesc("PROC");
     fprintf(client, "\n");
-    print_client("extern const MIDL_TYPE_FORMAT_STRING
__MIDL_TypeFormatString;\n");
-    print_client("extern const MIDL_PROC_FORMAT_STRING
__MIDL_ProcFormatString;\n");
+    print_client("static const MIDL_TYPE_FORMAT_STRING
__MIDL_TypeFormatString;\n");
+    print_client("static const MIDL_PROC_FORMAT_STRING
__MIDL_ProcFormatString;\n");
     print_client("\n");
 }

_____

Modified: trunk/reactos/tools/widl/server.c
--- trunk/reactos/tools/widl/server.c	2006-01-01 20:56:01 UTC (rev
20524)
+++ trunk/reactos/tools/widl/server.c	2006-01-01 20:59:39 UTC (rev
20525)
@@ -309,7 +309,7 @@

unsigned int type_offset = 2;
     int in_attr, out_attr;

-    print_server("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString
=\n");
+    print_server("static const MIDL_PROC_FORMAT_STRING
__MIDL_ProcFormatString =\n");
     print_server("{\n");
     indent++;
     print_server("0,\n");
@@ -426,7 +426,7 @@
     int ptr_attr, ref_attr, unique_attr;
     void *sizeis_attr;

-    print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString
=\n");
+    print_server("static const MIDL_TYPE_FORMAT_STRING
__MIDL_TypeFormatString =\n");
     print_server("{\n");
     indent++;
     print_server("0,\n");
@@ -1922,14 +1922,14 @@

static void write_stubdescdecl(type_t *iface)
 {
-    print_server("extern const MIDL_STUB_DESC %s_StubDesc;\n",
iface->name);
+    print_server("static const MIDL_STUB_DESC %s_StubDesc;\n",
iface->name);
     fprintf(server, "\n");
 }

static void write_stubdescriptor(type_t *iface)
 {
-    print_server("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);
+    print_server("static const MIDL_STUB_DESC %s_StubDesc =\n",
iface->name);
     print_server("{\n");
     indent++;
     print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n",
iface->name);
@@ -2093,8 +2093,8 @@
     write_formatdesc("TYPE");
     write_formatdesc("PROC");
     fprintf(server, "\n");
-    print_server("extern const MIDL_TYPE_FORMAT_STRING
__MIDL_TypeFormatString;\n");
-    print_server("extern const MIDL_PROC_FORMAT_STRING
__MIDL_ProcFormatString;\n");
+    print_server("static const MIDL_TYPE_FORMAT_STRING
__MIDL_TypeFormatString;\n");
+    print_server("static const MIDL_PROC_FORMAT_STRING
__MIDL_ProcFormatString;\n");
     print_server("\n");
 }