Modified: trunk/reactos/drivers/dd/beep/beep.c
Modified: trunk/reactos/drivers/dd/blue/blue.c
Modified: trunk/reactos/drivers/dd/debugout/debugout.c
Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c
Modified: trunk/reactos/drivers/dd/null/null.c
Modified: trunk/reactos/drivers/dd/parallel/parallel.c
Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c
Modified: trunk/reactos/drivers/dd/sound/sb16.c
Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c
Modified: trunk/reactos/drivers/fs/ext2/super.c
Modified: trunk/reactos/drivers/fs/ntfs/ntfs.c
Modified: trunk/reactos/drivers/fs/template/template.c
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c
Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c
Modified: trunk/reactos/drivers/input/i8042prt/mouse.c
Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c
Modified: trunk/reactos/drivers/input/i8042prt/registry.c
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c
Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.c
--- trunk/reactos/drivers/dd/beep/beep.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/beep/beep.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -14,7 +14,6 @@
#include <ddk/ntddk.h>
#include <ddk/ntddbeep.h>
-#include <rosrtl/string.h>
#define NDEBUG
#include <debug.h>
@@ -240,8 +239,8 @@
{
PDEVICE_EXTENSION DeviceExtension;
PDEVICE_OBJECT DeviceObject;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Beep");
- UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\Beep");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Beep");
+ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Beep");
NTSTATUS Status;
DPRINT("Beep Device Driver 0.0.3\n");
--- trunk/reactos/drivers/dd/blue/blue.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/blue/blue.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -14,7 +14,6 @@
#include <ddk/ntddk.h>
#include <ntos/halfuncs.h>
#include <ddk/ntddblue.h>
-#include <rosrtl/string.h>
#include <string.h>
#define NDEBUG
@@ -659,8 +658,8 @@
DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{
PDEVICE_OBJECT DeviceObject;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\BlueScreen");
- UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\BlueScreen");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BlueScreen");
+ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen");
DPRINT ("Screen Driver 0.0.6\n");
--- trunk/reactos/drivers/dd/debugout/debugout.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/debugout/debugout.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -23,7 +23,6 @@
/* INCLUDES */
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
/* FUNCTIONS */
NTSTATUS STDCALL
@@ -92,8 +91,8 @@
DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{
PDEVICE_OBJECT DebugOutDevice;
- UNICODE_STRING DeviceName;
- UNICODE_STRING DosName;
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\DebugOut");
+ UNICODE_STRING DosName = RTL_CONSTANT_STRING(L"\\DosDevices\\DebugOut");
NTSTATUS Status;
/* register driver routines */
@@ -105,8 +104,6 @@
DriverObject->DriverUnload = DebugOutUnload;
/* create device */
- RtlRosInitUnicodeStringFromLiteral(&DeviceName, L"\\Device\\DebugOut");
-
Status = IoCreateDevice(DriverObject, 0, &DeviceName, FILE_DEVICE_NULL,
0, FALSE, &DebugOutDevice);
if (! NT_SUCCESS(Status))
@@ -114,7 +111,6 @@
return Status;
}
- RtlRosInitUnicodeStringFromLiteral(&DosName, L"\\DosDevices\\DebugOut");
Status = IoCreateSymbolicLink(&DosName, &DeviceName);
if (! NT_SUCCESS(Status))
{
--- trunk/reactos/drivers/dd/mpu401/mpu401.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/mpu401/mpu401.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -13,7 +13,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
//#include <ddk/ntddbeep.h>
//#define NDEBUG
@@ -36,8 +35,8 @@
// PDEVICE_INSTANCE Instance = Context;
PDEVICE_OBJECT DeviceObject; // = Context;
PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\MidiOut0");
- UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\MidiOut0");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\MidiOut0");
+ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\MidiOut0");
// CONFIG Config;
RTL_QUERY_REGISTRY_TABLE Table[2];
NTSTATUS s;
--- trunk/reactos/drivers/dd/null/null.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/null/null.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -14,7 +14,6 @@
/* INCLUDES */
#include <ntddk.h>
-#include <rosrtl/string.h>
#include <pseh.h>
#include "null.h"
@@ -122,7 +121,8 @@
{
PDEVICE_OBJECT pdoNullDevice;
PDEVICE_OBJECT pdoZeroDevice;
- UNICODE_STRING wstrDeviceName;
+ UNICODE_STRING wstrNullDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Null");
+ UNICODE_STRING wstrZeroDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Zero");
NTSTATUS nErrCode;
/* register driver routines */
@@ -133,13 +133,11 @@
DriverObject->DriverUnload = NullUnload;
/* create null device */
- RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Null");
-
nErrCode = IoCreateDevice
(
DriverObject,
sizeof(NULL_EXTENSION),
- &wstrDeviceName,
+ &wstrNullDeviceName,
FILE_DEVICE_NULL,
0,
FALSE,
@@ -155,13 +153,11 @@
pdoNullDevice->DeviceExtension = (PVOID)&nxNull;
/* create zero device */
- RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Zero");
-
nErrCode = IoCreateDevice
(
DriverObject,
sizeof(NULL_EXTENSION),
- &wstrDeviceName,
+ &wstrZeroDeviceName,
FILE_DEVICE_NULL,
FILE_READ_ONLY_DEVICE, /* zero device is read-only */
FALSE,
--- trunk/reactos/drivers/dd/parallel/parallel.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/parallel/parallel.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -13,7 +13,6 @@
/* FUNCTIONS **************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
#include "parallel.h"
@@ -128,7 +127,7 @@
*/
{
PDEVICE_OBJECT DeviceObject;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Parallel");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Parallel");
NTSTATUS Status;
DPRINT("Parallel Port Driver 0.0.1\n");
--- trunk/reactos/drivers/dd/sndblst/sndblst.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/sndblst/sndblst.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -12,7 +12,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
#include "sndblst.h"
@@ -30,8 +29,8 @@
// PDEVICE_INSTANCE Instance = Context;
PDEVICE_OBJECT DeviceObject; // = Context;
PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\WaveOut0"); // CHANGE THESE?
- UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\WaveOut0");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\WaveOut0"); // CHANGE THESE?
+ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\WaveOut0");
// CONFIG Config;
RTL_QUERY_REGISTRY_TABLE Table[2];
--- trunk/reactos/drivers/dd/sound/sb16.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/dd/sound/sb16.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -13,7 +13,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
#define NDEBUG
#include <debug.h>
@@ -30,8 +29,8 @@
*/
{
PDEVICE_OBJECT DeviceObject;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\SNDBLST");
- UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\SNDBLST");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\SNDBLST");
+ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\SNDBLST");
NTSTATUS Status;
DPRINT1("Sound Blaster 16 Driver 0.0.1\n");
--- trunk/reactos/drivers/fs/cdfs/cdfs.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/fs/cdfs/cdfs.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -29,7 +29,6 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
#define NDEBUG
#include <debug.h>
@@ -57,7 +56,7 @@
{
PDEVICE_OBJECT DeviceObject;
NTSTATUS Status;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Cdfs");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Cdfs");
DPRINT("CDFS 0.0.3\n");
--- trunk/reactos/drivers/fs/ext2/super.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/fs/ext2/super.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -10,7 +10,6 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
//#define NDEBUG
#include <debug.h>
@@ -155,7 +154,7 @@
{
PDEVICE_OBJECT DeviceObject;
NTSTATUS ret;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Ext2Fsd");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Ext2Fsd");
DbgPrint("Ext2 FSD 0.0.1\n");
--- trunk/reactos/drivers/fs/ntfs/ntfs.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/fs/ntfs/ntfs.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -28,7 +28,6 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
#define NDEBUG
#include <debug.h>
@@ -56,7 +55,7 @@
{
PDEVICE_OBJECT DeviceObject;
NTSTATUS Status;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Ntfs");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Ntfs");
DPRINT("NTFS 0.0.1\n");
--- trunk/reactos/drivers/fs/template/template.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/fs/template/template.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -29,7 +29,6 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
-#include <rosrtl/string.h>
#define NDEBUG
#include <debug.h>
@@ -250,7 +249,7 @@
{
PDEVICE_OBJECT DeviceObject;
NTSTATUS Status;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\BareFsd");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BareFsd");
DbgPrint("Bare FSD Template 0.0.1\n");
--- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -11,11 +11,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/keyboard.h>
-#include <ntos/minmax.h>
-#include <rosrtl/string.h>
-
#include <ddk/ntddkbd.h>
#include <ddk/ntdd8042.h>
@@ -600,8 +595,8 @@
static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject,
PDEVICE_OBJECT Pdo)
{
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\KeyboardClass0");
- UNICODE_STRING MouseName = ROS_STRING_INITIALIZER(L"\\Device\\PointerClass0");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0");
+ UNICODE_STRING MouseName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0");
ULONG MappedIrqKeyboard = 0, MappedIrqMouse = 0;
KIRQL DirqlKeyboard = 0;
KIRQL DirqlMouse = 0;
--- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -12,11 +12,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/keyboard.h>
-#include <ntos/minmax.h>
-#include <rosrtl/string.h>
-
#include <ddk/ntddkbd.h>
#include <ddk/ntdd8042.h>
--- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -12,11 +12,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/keyboard.h>
-#include <ntos/minmax.h>
-#include <rosrtl/string.h>
-
#include <ddk/ntddkbd.h>
#include <ddk/ntdd8042.h>
--- trunk/reactos/drivers/input/i8042prt/ps2pp.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/input/i8042prt/ps2pp.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -10,7 +10,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-
#include <ddk/ntddkbd.h>
#include <ddk/ntdd8042.h>
--- trunk/reactos/drivers/input/i8042prt/registry.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/input/i8042prt/registry.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -12,11 +12,6 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/keyboard.h>
-#include <ntos/minmax.h>
-#include <rosrtl/string.h>
-
#include <ddk/ntddkbd.h>
#include <ddk/ntdd8042.h>
--- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -11,14 +11,7 @@
/* INCLUDES ****************************************************************/
#include <ddk/ntddk.h>
-#include <string.h>
-#include <ntos/keyboard.h>
-#include <ntos/minmax.h>
-#include <rosrtl/string.h>
-#include <ddk/ntddkbd.h>
-#include <ddk/ntdd8042.h>
-
#define NDEBUG
#include <debug.h>
@@ -254,9 +247,9 @@
PDEVICE_EXTENSION DevExt;
PFILE_OBJECT I8042File;
NTSTATUS Status;
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Keyboard");
- UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\Keyboard");
- UNICODE_STRING I8042Name = ROS_STRING_INITIALIZER(L"\\Device\\KeyboardClass0");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Keyboard");
+ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Keyboard");
+ UNICODE_STRING I8042Name = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0");
DPRINT("Keyboard Class Driver 0.0.1\n");
--- trunk/reactos/drivers/net/wshtcpip/wshtcpip.c 2005-06-19 00:06:08 UTC (rev 16067)
+++ trunk/reactos/drivers/net/wshtcpip/wshtcpip.c 2005-06-19 00:21:54 UTC (rev 16068)
@@ -8,7 +8,6 @@
* CSH 01/09-2000 Created
*/
#include <wshtcpip.h>
-#include <rosrtl/string.h>
#ifdef DBG
@@ -287,24 +286,27 @@
{
PSOCKET_CONTEXT Context;
UNICODE_STRING String;
+ UNICODE_STRING TcpDeviceName = RTL_CONSTANT_STRING(DD_TCP_DEVICE_NAME);
+ UNICODE_STRING UdpDeviceName = RTL_CONSTANT_STRING(DD_UDP_DEVICE_NAME);
+ UNICODE_STRING RawDeviceName = RTL_CONSTANT_STRING(DD_RAW_IP_DEVICE_NAME);
NTSTATUS Status;
WSH_DbgPrint(MAX_TRACE, ("\n"));
switch (*SocketType) {
case SOCK_STREAM:
- RtlRosInitUnicodeStringFromLiteral(&String, DD_TCP_DEVICE_NAME);
+ String = TcpDeviceName;
break;
case SOCK_DGRAM:
- RtlRosInitUnicodeStringFromLiteral(&String, DD_UDP_DEVICE_NAME);
+ String = UdpDeviceName;
break;
case SOCK_RAW:
if ((*Protocol < 0) || (*Protocol > 255))
return WSAEINVAL;
- RtlRosInitUnicodeStringFromLiteral(&String, DD_RAW_IP_DEVICE_NAME);
+ String = RawDeviceName;
break;
default: