Use W32API.

svn path=/trunk/; revision=15970

diff --git a/reactos/drivers/dd/blue/blue.xml b/reactos/drivers/dd/blue/blue.xml
index b64bf11..db8f8a5 100644 (file)
--- a/reactos/drivers/dd/blue/blue.xml
+++ b/reactos/drivers/dd/blue/blue.xml
@@ -1,5 +1,6 @@
 <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">\r
        <bootstrap base="reactos" />\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <file>blue.c</file>\r

diff --git a/reactos/drivers/dd/bootvid/bootvid.c b/reactos/drivers/dd/bootvid/bootvid.c
index 38b6150..8dca7ab 100644 (file)
--- a/reactos/drivers/dd/bootvid/bootvid.c
+++ b/reactos/drivers/dd/bootvid/bootvid.c
@@ -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 @@ NTSTATUS STDCALL
 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 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
    DriverObject->Flags |= DO_BUFFERED_IO;
 
    /* Create device */
-   RtlRosInitUnicodeStringFromLiteral(&DeviceName, L"\\Device\\BootVid");
-
    Status = IoCreateDevice(
       DriverObject,
       0,

diff --git a/reactos/drivers/dd/bootvid/bootvid.xml b/reactos/drivers/dd/bootvid/bootvid.xml
index 11f0003..24cee1b 100644 (file)
--- a/reactos/drivers/dd/bootvid/bootvid.xml
+++ b/reactos/drivers/dd/bootvid/bootvid.xml
@@ -1,5 +1,6 @@
 <module name="bootvid" type="kernelmodedriver" installbase="system32/drivers" installname="bootvid.sys">\r
        <include base="bootvid">.</include>\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <file>bootvid.c</file>\r

diff --git a/reactos/drivers/dd/debugout/debugout.xml b/reactos/drivers/dd/debugout/debugout.xml
index 244bfc3..3a89263 100644 (file)
--- a/reactos/drivers/dd/debugout/debugout.xml
+++ b/reactos/drivers/dd/debugout/debugout.xml
@@ -1,5 +1,6 @@
 <module name="debugout" type="kernelmodedriver">\r
        <include base="debugout">.</include>\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <file>debugout.c</file>\r

diff --git a/reactos/drivers/dd/mpu401/mpu401.xml b/reactos/drivers/dd/mpu401/mpu401.xml
index e28339c..a1c63eb 100644 (file)
--- a/reactos/drivers/dd/mpu401/mpu401.xml
+++ b/reactos/drivers/dd/mpu401/mpu401.xml
@@ -1,5 +1,6 @@
 <module name="mpu401" type="kernelmodedriver">\r
        <include base="mpu401">.</include>\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <file>mpu401.c</file>\r

diff --git a/reactos/drivers/dd/parallel/parallel.xml b/reactos/drivers/dd/parallel/parallel.xml
index 52bfc5d..145d8ab 100644 (file)
--- a/reactos/drivers/dd/parallel/parallel.xml
+++ b/reactos/drivers/dd/parallel/parallel.xml
@@ -1,5 +1,6 @@
 <module name="parallel" type="kernelmodedriver">\r
        <include base="parallel">.</include>\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <file>parallel.c</file>\r

diff --git a/reactos/drivers/dd/ramdrv/ramdrv.c b/reactos/drivers/dd/ramdrv/ramdrv.c
index d1eae39..a458e6d 100644 (file)
--- a/reactos/drivers/dd/ramdrv/ramdrv.c
+++ b/reactos/drivers/dd/ramdrv/ramdrv.c
@@ -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 RamdrvDispatchOpenClose(PDEVICE_OBJECT DeviceObject,
 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 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject,
       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 );

diff --git a/reactos/drivers/dd/ramdrv/ramdrv.xml b/reactos/drivers/dd/ramdrv/ramdrv.xml
index 1c4c495..58a7e77 100644 (file)
--- a/reactos/drivers/dd/ramdrv/ramdrv.xml
+++ b/reactos/drivers/dd/ramdrv/ramdrv.xml
@@ -1,5 +1,6 @@
 <module name="ramdrv" type="kernelmodedriver">\r
        <include base="ramdrv">.</include>\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <library>bzip2</library>\r

diff --git a/reactos/drivers/dd/sound/sound.xml b/reactos/drivers/dd/sound/sound.xml
index 6dc7776..8065167 100644 (file)
--- a/reactos/drivers/dd/sound/sound.xml
+++ b/reactos/drivers/dd/sound/sound.xml
@@ -1,4 +1,5 @@
 <module name="sound" type="kernelmodedriver">\r
+        <define name="__USE_W32API" />\r
        <library>ntoskrnl</library>\r
        <library>hal</library>\r
        <file>dsp.c</file>\r