Use RTL_CONSTANT_STRING instead of ROSRTL macros.

Modified: trunk/reactos/drivers/net/lan/include/precomp.h
Modified: trunk/reactos/drivers/net/lan/lan/lan.c
Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h
Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c

--- trunk/reactos/drivers/net/lan/include/precomp.h	2005-06-19 00:21:54 UTC (rev 16068)
+++ trunk/reactos/drivers/net/lan/include/precomp.h	2005-06-19 00:28:46 UTC (rev 16069)
@@ -4,7 +4,6 @@

 #include <limits.h>
 #include <ddk/ntddk.h>
 #include <ddk/ndis.h>

-#include <rosrtl/string.h>

 #include <roscfg.h>
 #include <debug.h>
 #include <pseh.h>

--- trunk/reactos/drivers/net/lan/lan/lan.c	2005-06-19 00:21:54 UTC (rev 16068)
+++ trunk/reactos/drivers/net/lan/lan/lan.c	2005-06-19 00:28:46 UTC (rev 16069)
@@ -1289,7 +1289,8 @@

 			      PUNICODE_STRING RegsitryPath ) {
     PDEVICE_OBJECT DeviceObject;
     PLAN_DEVICE_EXT DeviceExt;

-    UNICODE_STRING wstrDeviceName, LanString;

+    UNICODE_STRING wstrDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Lan");
+    UNICODE_STRING LanString = RTL_CONSTANT_STRING(L"LAN");

     NTSTATUS Status;
 
     InitNdisPools();
@@ -1303,9 +1304,6 @@

     DriverObject->DriverUnload = LanUnload;
 
     /* create lan device */

-    RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Lan");
-    RtlRosInitUnicodeStringFromLiteral(&LanString, L"LAN");
-

     Status = IoCreateDevice
 	( DriverObject,
 	  sizeof(LAN_DEVICE_EXT),

--- trunk/reactos/drivers/net/tcpip/include/precomp.h	2005-06-19 00:21:54 UTC (rev 16068)
+++ trunk/reactos/drivers/net/tcpip/include/precomp.h	2005-06-19 00:28:46 UTC (rev 16069)
@@ -1,7 +1,6 @@

 #include <roscfg.h>
 #include <limits.h>
 #include <ddk/ntddk.h>

-#include <rosrtl/string.h>

 #include <rosrtl/recmutex.h>
 #include <roscfg.h>
 #include <tcpip.h>

--- trunk/reactos/drivers/net/tcpip/tcpip/main.c	2005-06-19 00:21:54 UTC (rev 16068)
+++ trunk/reactos/drivers/net/tcpip/tcpip/main.c	2005-06-19 00:28:46 UTC (rev 16069)
@@ -706,8 +706,11 @@

  */
 {
   NTSTATUS Status;

-  UNICODE_STRING strDeviceName;
-  UNICODE_STRING strNdisDeviceName;

+  UNICODE_STRING strIpDeviceName = RTL_CONSTANT_STRING(DD_IP_DEVICE_NAME);
+  UNICODE_STRING strRawDeviceName = RTL_CONSTANT_STRING(DD_RAWIP_DEVICE_NAME);
+  UNICODE_STRING strUdpDeviceName = RTL_CONSTANT_STRING(DD_UDP_DEVICE_NAME);
+  UNICODE_STRING strTcpDeviceName = RTL_CONSTANT_STRING(DD_TCP_DEVICE_NAME);
+  UNICODE_STRING strNdisDeviceName = RTL_CONSTANT_STRING(TCPIP_PROTOCOL_NAME);

   NDIS_STATUS NdisStatus;
   LARGE_INTEGER DueTime;
 
@@ -724,8 +727,7 @@

   /* FIXME: Create symbolic links in Win32 namespace */
 
   /* Create IP device object */

-  RtlRosInitUnicodeStringFromLiteral(&strDeviceName, DD_IP_DEVICE_NAME);
-  Status = IoCreateDevice(DriverObject, 0, &strDeviceName,

+  Status = IoCreateDevice(DriverObject, 0, &strIpDeviceName,

     FILE_DEVICE_NETWORK, 0, FALSE, &IPDeviceObject);
   if (!NT_SUCCESS(Status)) {
     TI_DbgPrint(MIN_TRACE, ("Failed to create IP device object. Status (0x%X).\n", Status));
@@ -733,8 +735,7 @@

   }
 
   /* Create RawIP device object */

-  RtlRosInitUnicodeStringFromLiteral(&strDeviceName, DD_RAWIP_DEVICE_NAME);
-  Status = IoCreateDevice(DriverObject, 0, &strDeviceName,

+  Status = IoCreateDevice(DriverObject, 0, &strRawDeviceName,

     FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject);
   if (!NT_SUCCESS(Status)) {
     TI_DbgPrint(MIN_TRACE, ("Failed to create RawIP device object. Status (0x%X).\n", Status));
@@ -743,8 +744,7 @@

   }
 
   /* Create UDP device object */

-  RtlRosInitUnicodeStringFromLiteral(&strDeviceName, DD_UDP_DEVICE_NAME);
-  Status = IoCreateDevice(DriverObject, 0, &strDeviceName,

+  Status = IoCreateDevice(DriverObject, 0, &strUdpDeviceName,

     FILE_DEVICE_NETWORK, 0, FALSE, &UDPDeviceObject);
   if (!NT_SUCCESS(Status)) {
     TI_DbgPrint(MIN_TRACE, ("Failed to create UDP device object. Status (0x%X).\n", Status));
@@ -753,8 +753,7 @@

   }
 
   /* Create TCP device object */

-  RtlRosInitUnicodeStringFromLiteral(&strDeviceName, DD_TCP_DEVICE_NAME);
-  Status = IoCreateDevice(DriverObject, 0, &strDeviceName,

+  Status = IoCreateDevice(DriverObject, 0, &strTcpDeviceName,

     FILE_DEVICE_NETWORK, 0, FALSE, &TCPDeviceObject);
   if (!NT_SUCCESS(Status)) {
     TI_DbgPrint(MIN_TRACE, ("Failed to create TCP device object. Status (0x%X).\n", Status));
@@ -823,7 +822,6 @@

 
   /* Register protocol with NDIS */
   /* This used to be IP_DEVICE_NAME but the DDK says it has to match your entry in the SCM */

-  RtlInitUnicodeString(&strNdisDeviceName, TCPIP_PROTOCOL_NAME);

   Status = LANRegisterProtocol(&strNdisDeviceName);
   if (!NT_SUCCESS(Status)) {
 	  TI_DbgPrint(MIN_TRACE,("Failed to register protocol with NDIS; status 0x%x\n", Status));