Kill rosrtl

svn path=/trunk/; revision=16347
This commit is contained in:
Alex Ionescu 2005-06-30 16:04:08 +00:00
parent bc4215dca5
commit d280ce9240
3 changed files with 4 additions and 11 deletions

View file

@ -72,7 +72,8 @@ IntSetCaretBlinkTime(UINT uMSeconds)
UINT FASTCALL UINT FASTCALL
IntQueryCaretBlinkRate(VOID) IntQueryCaretBlinkRate(VOID)
{ {
UNICODE_STRING KeyName, ValueName; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(CARET_REGKEY);
UNICODE_STRING ValueName = RTL_CONSTANT_STRING(CARET_VALUENAME);
NTSTATUS Status; NTSTATUS Status;
HANDLE KeyHandle = NULL; HANDLE KeyHandle = NULL;
OBJECT_ATTRIBUTES KeyAttributes; OBJECT_ATTRIBUTES KeyAttributes;
@ -81,9 +82,6 @@ IntQueryCaretBlinkRate(VOID)
ULONG ResLength = 0; ULONG ResLength = 0;
ULONG Val = 0; ULONG Val = 0;
RtlRosInitUnicodeStringFromLiteral(&KeyName, CARET_REGKEY);
RtlRosInitUnicodeStringFromLiteral(&ValueName, CARET_VALUENAME);
InitializeObjectAttributes(&KeyAttributes, &KeyName, OBJ_CASE_INSENSITIVE, InitializeObjectAttributes(&KeyAttributes, &KeyName, OBJ_CASE_INSENSITIVE,
NULL, NULL); NULL, NULL);

View file

@ -149,12 +149,11 @@ ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount)
VOID STDCALL VOID STDCALL
MouseThreadMain(PVOID StartContext) MouseThreadMain(PVOID StartContext)
{ {
UNICODE_STRING MouseDeviceName; UNICODE_STRING MouseDeviceName = RTL_CONSTANT_STRING(L"\\??\\Mouse");
OBJECT_ATTRIBUTES MouseObjectAttributes; OBJECT_ATTRIBUTES MouseObjectAttributes;
IO_STATUS_BLOCK Iosb; IO_STATUS_BLOCK Iosb;
NTSTATUS Status; NTSTATUS Status;
RtlRosInitUnicodeStringFromLiteral(&MouseDeviceName, L"\\??\\Mouse"); /* FIXME - does win use the same? */
InitializeObjectAttributes(&MouseObjectAttributes, InitializeObjectAttributes(&MouseObjectAttributes,
&MouseDeviceName, &MouseDeviceName,
0, 0,
@ -404,7 +403,7 @@ IntKeyboardSendAltKeyMsg()
STATIC VOID STDCALL STATIC VOID STDCALL
KeyboardThreadMain(PVOID StartContext) KeyboardThreadMain(PVOID StartContext)
{ {
UNICODE_STRING KeyboardDeviceName; UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\??\\Keyboard");
OBJECT_ATTRIBUTES KeyboardObjectAttributes; OBJECT_ATTRIBUTES KeyboardObjectAttributes;
IO_STATUS_BLOCK Iosb; IO_STATUS_BLOCK Iosb;
NTSTATUS Status; NTSTATUS Status;
@ -420,7 +419,6 @@ KeyboardThreadMain(PVOID StartContext)
USHORT LastFlags = 0; USHORT LastFlags = 0;
UINT RepeatCount = 0; UINT RepeatCount = 0;
RtlRosInitUnicodeStringFromLiteral(&KeyboardDeviceName, L"\\??\\Keyboard");
InitializeObjectAttributes(&KeyboardObjectAttributes, InitializeObjectAttributes(&KeyboardObjectAttributes,
&KeyboardDeviceName, &KeyboardDeviceName,
0, 0,

View file

@ -39,9 +39,6 @@ MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes);
/* CSRSS Header */ /* CSRSS Header */
#include <csrss/csrss.h> #include <csrss/csrss.h>
/* FIXME: ROSRTL */
#include <rosrtl/string.h>
/* Helper Header */ /* Helper Header */
#include <reactos/helper.h> #include <reactos/helper.h>