Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use RTL_CONSTANT_STRING instead of ROSRTL macros.

Browse source 
svn path=/trunk/; revision=16068
This commit is contained in:
Filip Navara 2005-06-19 00:21:54 +00:00
parent 7971e8425b
commit cc03f70b55
19 changed files with 32 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/drivers/dd/beep/beep.c
View file

@ -14,7 +14,6 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ddk/ntddbeep.h> #include <ddk/ntddbeep.h>
#include <rosrtl/string.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -240,8 +239,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
{ {
PDEVICE_EXTENSION DeviceExtension; PDEVICE_EXTENSION DeviceExtension;
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Beep"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Beep");
UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\Beep"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Beep");
NTSTATUS Status; NTSTATUS Status;
DPRINT("Beep Device Driver 0.0.3\n"); DPRINT("Beep Device Driver 0.0.3\n");

5
reactos/drivers/dd/blue/blue.c
View file

@ -14,7 +14,6 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ntos/halfuncs.h> #include <ntos/halfuncs.h>
#include <ddk/ntddblue.h> #include <ddk/ntddblue.h>
#include <rosrtl/string.h>
#include <string.h> #include <string.h>
#define NDEBUG #define NDEBUG
@ -659,8 +658,8 @@ NTSTATUS STDCALL
DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\BlueScreen"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BlueScreen");
UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\BlueScreen"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen");
DPRINT ("Screen Driver 0.0.6\n"); DPRINT ("Screen Driver 0.0.6\n");

8
reactos/drivers/dd/debugout/debugout.c
View file

@ -23,7 +23,6 @@
/* INCLUDES */ /* INCLUDES */
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
/* FUNCTIONS */ /* FUNCTIONS */
NTSTATUS STDCALL NTSTATUS STDCALL
@ -92,8 +91,8 @@ NTSTATUS STDCALL
DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{ {
PDEVICE_OBJECT DebugOutDevice; PDEVICE_OBJECT DebugOutDevice;
UNICODE_STRING DeviceName; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\DebugOut");
UNICODE_STRING DosName; UNICODE_STRING DosName = RTL_CONSTANT_STRING(L"\\DosDevices\\DebugOut");
NTSTATUS Status; NTSTATUS Status;
/* register driver routines */ /* register driver routines */
@ -105,8 +104,6 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
DriverObject->DriverUnload = DebugOutUnload; DriverObject->DriverUnload = DebugOutUnload;
/* create device */ /* create device */
RtlRosInitUnicodeStringFromLiteral(&DeviceName, L"\\Device\\DebugOut");
Status = IoCreateDevice(DriverObject, 0, &DeviceName, FILE_DEVICE_NULL, Status = IoCreateDevice(DriverObject, 0, &DeviceName, FILE_DEVICE_NULL,
0, FALSE, &DebugOutDevice); 0, FALSE, &DebugOutDevice);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
@ -114,7 +111,6 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
return Status; return Status;
} }
RtlRosInitUnicodeStringFromLiteral(&DosName, L"\\DosDevices\\DebugOut");
Status = IoCreateSymbolicLink(&DosName, &DeviceName); Status = IoCreateSymbolicLink(&DosName, &DeviceName);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {

5
reactos/drivers/dd/mpu401/mpu401.c
View file

@ -13,7 +13,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
//#include <ddk/ntddbeep.h> //#include <ddk/ntddbeep.h>
//#define NDEBUG //#define NDEBUG
@ -36,8 +35,8 @@ NTSTATUS InitDevice(
// PDEVICE_INSTANCE Instance = Context; // PDEVICE_INSTANCE Instance = Context;
PDEVICE_OBJECT DeviceObject; // = Context; PDEVICE_OBJECT DeviceObject; // = Context;
PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension; PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\MidiOut0"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\MidiOut0");
UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\MidiOut0"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\MidiOut0");
// CONFIG Config; // CONFIG Config;
RTL_QUERY_REGISTRY_TABLE Table[2]; RTL_QUERY_REGISTRY_TABLE Table[2];
NTSTATUS s; NTSTATUS s;

12
reactos/drivers/dd/null/null.c
View file

@ -14,7 +14,6 @@
/* INCLUDES */ /* INCLUDES */
#include <ntddk.h> #include <ntddk.h>
#include <rosrtl/string.h>
#include <pseh.h> #include <pseh.h>
#include "null.h" #include "null.h"
@ -122,7 +121,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{ {
PDEVICE_OBJECT pdoNullDevice; PDEVICE_OBJECT pdoNullDevice;
PDEVICE_OBJECT pdoZeroDevice; 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; NTSTATUS nErrCode;
/* register driver routines */ /* register driver routines */
@ -133,13 +133,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
DriverObject->DriverUnload = NullUnload; DriverObject->DriverUnload = NullUnload;
/* create null device */ /* create null device */
RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Null");
nErrCode = IoCreateDevice nErrCode = IoCreateDevice
( (
DriverObject, DriverObject,
sizeof(NULL_EXTENSION), sizeof(NULL_EXTENSION),
&wstrDeviceName, &wstrNullDeviceName,
FILE_DEVICE_NULL, FILE_DEVICE_NULL,
0, 0,
FALSE, FALSE,
@ -155,13 +153,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
pdoNullDevice->DeviceExtension = (PVOID)&nxNull; pdoNullDevice->DeviceExtension = (PVOID)&nxNull;
/* create zero device */ /* create zero device */
RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Zero");
nErrCode = IoCreateDevice nErrCode = IoCreateDevice
( (
DriverObject, DriverObject,
sizeof(NULL_EXTENSION), sizeof(NULL_EXTENSION),
&wstrDeviceName, &wstrZeroDeviceName,
FILE_DEVICE_NULL, FILE_DEVICE_NULL,
FILE_READ_ONLY_DEVICE, /* zero device is read-only */ FILE_READ_ONLY_DEVICE, /* zero device is read-only */
FALSE, FALSE,

3
reactos/drivers/dd/parallel/parallel.c
View file

@ -13,7 +13,6 @@
/* FUNCTIONS **************************************************************/ /* FUNCTIONS **************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
#include "parallel.h" #include "parallel.h"
@ -128,7 +127,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
*/ */
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Parallel"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Parallel");
NTSTATUS Status; NTSTATUS Status;
DPRINT("Parallel Port Driver 0.0.1\n"); DPRINT("Parallel Port Driver 0.0.1\n");

5
reactos/drivers/dd/sndblst/sndblst.c
View file

@ -12,7 +12,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
#include "sndblst.h" #include "sndblst.h"
@ -30,8 +29,8 @@ NTSTATUS InitDevice(
// PDEVICE_INSTANCE Instance = Context; // PDEVICE_INSTANCE Instance = Context;
PDEVICE_OBJECT DeviceObject; // = Context; PDEVICE_OBJECT DeviceObject; // = Context;
PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension; PDEVICE_EXTENSION Parameters; // = DeviceObject->DeviceExtension;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\WaveOut0"); // CHANGE THESE? UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\WaveOut0"); // CHANGE THESE?
UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\WaveOut0"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\WaveOut0");
// CONFIG Config; // CONFIG Config;
RTL_QUERY_REGISTRY_TABLE Table[2]; RTL_QUERY_REGISTRY_TABLE Table[2];

5
reactos/drivers/dd/sound/sb16.c
View file

@ -13,7 +13,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -30,8 +29,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
*/ */
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\SNDBLST"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\SNDBLST");
UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\SNDBLST"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\SNDBLST");
NTSTATUS Status; NTSTATUS Status;
DPRINT1("Sound Blaster 16 Driver 0.0.1\n"); DPRINT1("Sound Blaster 16 Driver 0.0.1\n");

3
reactos/drivers/fs/cdfs/cdfs.c
View file

@ -29,7 +29,6 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -57,7 +56,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
NTSTATUS Status; NTSTATUS Status;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Cdfs"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Cdfs");
DPRINT("CDFS 0.0.3\n"); DPRINT("CDFS 0.0.3\n");

3
reactos/drivers/fs/ext2/super.c
View file

@ -10,7 +10,6 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
//#define NDEBUG //#define NDEBUG
#include <debug.h> #include <debug.h>
@ -155,7 +154,7 @@ DriverEntry(PDRIVER_OBJECT _DriverObject,
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
NTSTATUS ret; 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"); DbgPrint("Ext2 FSD 0.0.1\n");

3
reactos/drivers/fs/ntfs/ntfs.c
View file

@ -28,7 +28,6 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -56,7 +55,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
NTSTATUS Status; NTSTATUS Status;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Ntfs"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Ntfs");
DPRINT("NTFS 0.0.1\n"); DPRINT("NTFS 0.0.1\n");

3
reactos/drivers/fs/template/template.c
View file

@ -29,7 +29,6 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <rosrtl/string.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -250,7 +249,7 @@ DriverEntry(PDRIVER_OBJECT _DriverObject,
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
NTSTATUS Status; 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"); DbgPrint("Bare FSD Template 0.0.1\n");

9
reactos/drivers/input/i8042prt/i8042prt.c
View file

@ -11,11 +11,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #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/ntddkbd.h>
#include <ddk/ntdd8042.h> #include <ddk/ntdd8042.h>
@ -600,8 +595,8 @@ static NTSTATUS STDCALL I8042Initialize(PDEVICE_EXTENSION DevExt)
static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject, static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject,
PDEVICE_OBJECT Pdo) PDEVICE_OBJECT Pdo)
{ {
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\KeyboardClass0"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0");
UNICODE_STRING MouseName = ROS_STRING_INITIALIZER(L"\\Device\\PointerClass0"); UNICODE_STRING MouseName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0");
ULONG MappedIrqKeyboard = 0, MappedIrqMouse = 0; ULONG MappedIrqKeyboard = 0, MappedIrqMouse = 0;
KIRQL DirqlKeyboard = 0; KIRQL DirqlKeyboard = 0;
KIRQL DirqlMouse = 0; KIRQL DirqlMouse = 0;

5
reactos/drivers/input/i8042prt/keyboard.c
View file

@ -12,11 +12,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #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/ntddkbd.h>
#include <ddk/ntdd8042.h> #include <ddk/ntdd8042.h>

5
reactos/drivers/input/i8042prt/mouse.c
View file

@ -12,11 +12,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #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/ntddkbd.h>
#include <ddk/ntdd8042.h> #include <ddk/ntdd8042.h>

1
reactos/drivers/input/i8042prt/ps2pp.c
View file

@ -10,7 +10,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ddk/ntddkbd.h> #include <ddk/ntddkbd.h>
#include <ddk/ntdd8042.h> #include <ddk/ntdd8042.h>

5
reactos/drivers/input/i8042prt/registry.c
View file

@ -12,11 +12,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #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/ntddkbd.h>
#include <ddk/ntdd8042.h> #include <ddk/ntdd8042.h>

13
reactos/drivers/input/kbdclass/kbdclass.c
View file

@ -11,13 +11,6 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #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 #define NDEBUG
#include <debug.h> #include <debug.h>
@ -254,9 +247,9 @@ NTSTATUS STDCALL DriverEntry(PDRIVER_OBJECT DriverObject,
PDEVICE_EXTENSION DevExt; PDEVICE_EXTENSION DevExt;
PFILE_OBJECT I8042File; PFILE_OBJECT I8042File;
NTSTATUS Status; NTSTATUS Status;
UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Keyboard"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Keyboard");
UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\Keyboard"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Keyboard");
UNICODE_STRING I8042Name = ROS_STRING_INITIALIZER(L"\\Device\\KeyboardClass0"); UNICODE_STRING I8042Name = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0");
DPRINT("Keyboard Class Driver 0.0.1\n"); DPRINT("Keyboard Class Driver 0.0.1\n");

10
reactos/drivers/net/wshtcpip/wshtcpip.c
View file

@ -8,7 +8,6 @@
* CSH 01/09-2000 Created * CSH 01/09-2000 Created
*/ */
#include <wshtcpip.h> #include <wshtcpip.h>
#include <rosrtl/string.h>
#ifdef DBG #ifdef DBG
@ -287,24 +286,27 @@ WSHOpenSocket2(
{ {
PSOCKET_CONTEXT Context; PSOCKET_CONTEXT Context;
UNICODE_STRING String; 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; NTSTATUS Status;
WSH_DbgPrint(MAX_TRACE, ("\n")); WSH_DbgPrint(MAX_TRACE, ("\n"));
switch (*SocketType) { switch (*SocketType) {
case SOCK_STREAM: case SOCK_STREAM:
RtlRosInitUnicodeStringFromLiteral(&String, DD_TCP_DEVICE_NAME); String = TcpDeviceName;
break; break;
case SOCK_DGRAM: case SOCK_DGRAM:
RtlRosInitUnicodeStringFromLiteral(&String, DD_UDP_DEVICE_NAME); String = UdpDeviceName;
break; break;
case SOCK_RAW: case SOCK_RAW:
if ((*Protocol < 0) || (*Protocol > 255)) if ((*Protocol < 0) || (*Protocol > 255))
return WSAEINVAL; return WSAEINVAL;
RtlRosInitUnicodeStringFromLiteral(&String, DD_RAW_IP_DEVICE_NAME); String = RawDeviceName;
break; break;
default: default: