Modified: trunk/reactos/drivers/dd/blue/blue.xml
Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c
Modified: trunk/reactos/drivers/dd/bootvid/bootvid.xml
Modified: trunk/reactos/drivers/dd/debugout/debugout.xml
Modified: trunk/reactos/drivers/dd/mpu401/mpu401.xml
Modified: trunk/reactos/drivers/dd/parallel/parallel.xml
Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c
Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.xml
Modified: trunk/reactos/drivers/dd/sound/sound.xml
--- trunk/reactos/drivers/dd/blue/blue.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/blue/blue.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,5 +1,6 @@
<module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">
<bootstrap base="reactos" />
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<file>blue.c</file>
--- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-17 11:40:11 UTC (rev 15970)
@@ -25,7 +25,8 @@
#include <ddk/ntddk.h>
#include <ddk/ntbootvid.h>
-#include <rosrtl/string.h>
+#include <ntos/ldrtypes.h>
+#include <ddk/ldrfuncs.h>
#include "bootvid.h"
#include "resource.h"
@@ -634,7 +635,7 @@
DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{
PDEVICE_OBJECT BootVidDevice;
- UNICODE_STRING DeviceName;
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BootVid");
NTSTATUS Status;
BootVidDriverObject = DriverObject;
@@ -648,8 +649,6 @@
DriverObject->Flags |= DO_BUFFERED_IO;
/* Create device */
- RtlRosInitUnicodeStringFromLiteral(&DeviceName, L"\\Device\\BootVid");
-
Status = IoCreateDevice(
DriverObject,
0,
--- trunk/reactos/drivers/dd/bootvid/bootvid.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/bootvid/bootvid.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,5 +1,6 @@
<module name="bootvid" type="kernelmodedriver" installbase="system32/drivers" installname="bootvid.sys">
<include base="bootvid">.</include>
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<file>bootvid.c</file>
--- trunk/reactos/drivers/dd/debugout/debugout.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/debugout/debugout.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,5 +1,6 @@
<module name="debugout" type="kernelmodedriver">
<include base="debugout">.</include>
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<file>debugout.c</file>
--- trunk/reactos/drivers/dd/mpu401/mpu401.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/mpu401/mpu401.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,5 +1,6 @@
<module name="mpu401" type="kernelmodedriver">
<include base="mpu401">.</include>
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<file>mpu401.c</file>
--- trunk/reactos/drivers/dd/parallel/parallel.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/parallel/parallel.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,5 +1,6 @@
<module name="parallel" type="kernelmodedriver">
<include base="parallel">.</include>
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<file>parallel.c</file>
--- trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,7 +1,7 @@
#include <ntddk.h>
+#include <ntdddisk.h>
#include "ramdrv.h"
#include <debug.h>
-#include <rosrtl/string.h>
#include "../../lib/bzip2/bzlib.h"
NTSTATUS STDCALL RamdrvDispatchDeviceControl(PDEVICE_OBJECT DeviceObject,
@@ -84,11 +84,12 @@
NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegistryPath)
{
- UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Ramdisk");
+ UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Ramdisk");
NTSTATUS Status;
PDEVICE_OBJECT DeviceObject;
PRAMDRV_DEVICE_EXTENSION devext;
- UNICODE_STRING LinkName;
+ UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\??\\Z:");
+ UNICODE_STRING ImageName = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\ramdisk.bz2");
HANDLE file;
OBJECT_ATTRIBUTES objattr;
IO_STATUS_BLOCK iosb;
@@ -128,12 +129,10 @@
Status = STATUS_INSUFFICIENT_RESOURCES;
goto cleandevice;
}
- RtlRosInitUnicodeStringFromLiteral( &LinkName, L"\\??\\Z:" );
IoCreateSymbolicLink( &LinkName, &DeviceName );
- RtlRosInitUnicodeStringFromLiteral( &LinkName, L"\\Device\\Floppy0\\ramdisk.bz2" );
InitializeObjectAttributes( &objattr,
- &LinkName,
+ &ImageName,
0,
0,
0 );
--- trunk/reactos/drivers/dd/ramdrv/ramdrv.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/ramdrv/ramdrv.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,5 +1,6 @@
<module name="ramdrv" type="kernelmodedriver">
<include base="ramdrv">.</include>
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<library>bzip2</library>
--- trunk/reactos/drivers/dd/sound/sound.xml 2005-06-17 11:29:07 UTC (rev 15969)
+++ trunk/reactos/drivers/dd/sound/sound.xml 2005-06-17 11:40:11 UTC (rev 15970)
@@ -1,4 +1,5 @@
<module name="sound" type="kernelmodedriver">
+ <define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
<file>dsp.c</file>