--- trunk/reactos/subsys/win32k/ntuser/caret.c 2005-06-30 14:38:53 UTC (rev 16346)
+++ trunk/reactos/subsys/win32k/ntuser/caret.c 2005-06-30 16:04:08 UTC (rev 16347)
@@ -72,7 +72,8 @@
UINT FASTCALL
IntQueryCaretBlinkRate(VOID)
{
- UNICODE_STRING KeyName, ValueName;
+ UNICODE_STRING KeyName = RTL_CONSTANT_STRING(CARET_REGKEY);
+ UNICODE_STRING ValueName = RTL_CONSTANT_STRING(CARET_VALUENAME);
NTSTATUS Status;
HANDLE KeyHandle = NULL;
OBJECT_ATTRIBUTES KeyAttributes;
@@ -81,9 +82,6 @@
ULONG ResLength = 0;
ULONG Val = 0;
- RtlRosInitUnicodeStringFromLiteral(&KeyName, CARET_REGKEY);
- RtlRosInitUnicodeStringFromLiteral(&ValueName, CARET_VALUENAME);
-
InitializeObjectAttributes(&KeyAttributes, &KeyName, OBJ_CASE_INSENSITIVE,
NULL, NULL);
--- trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-30 14:38:53 UTC (rev 16346)
+++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-30 16:04:08 UTC (rev 16347)
@@ -149,12 +149,11 @@
VOID STDCALL
MouseThreadMain(PVOID StartContext)
{
- UNICODE_STRING MouseDeviceName;
+ UNICODE_STRING MouseDeviceName = RTL_CONSTANT_STRING(L"\\??\\Mouse");
OBJECT_ATTRIBUTES MouseObjectAttributes;
IO_STATUS_BLOCK Iosb;
NTSTATUS Status;
- RtlRosInitUnicodeStringFromLiteral(&MouseDeviceName, L"\\??\\Mouse"); /* FIXME - does win use the same? */
InitializeObjectAttributes(&MouseObjectAttributes,
&MouseDeviceName,
0,
@@ -404,7 +403,7 @@
STATIC VOID STDCALL
KeyboardThreadMain(PVOID StartContext)
{
- UNICODE_STRING KeyboardDeviceName;
+ UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\??\\Keyboard");
OBJECT_ATTRIBUTES KeyboardObjectAttributes;
IO_STATUS_BLOCK Iosb;
NTSTATUS Status;
@@ -420,7 +419,6 @@
USHORT LastFlags = 0;
UINT RepeatCount = 0;
- RtlRosInitUnicodeStringFromLiteral(&KeyboardDeviceName, L"\\??\\Keyboard");
InitializeObjectAttributes(&KeyboardObjectAttributes,
&KeyboardDeviceName,
0,
--- trunk/reactos/subsys/win32k/w32k.h 2005-06-30 14:38:53 UTC (rev 16346)
+++ trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:04:08 UTC (rev 16347)
@@ -39,9 +39,6 @@
/* CSRSS Header */
#include <csrss/csrss.h>
-/* FIXME: ROSRTL */
-#include <rosrtl/string.h>
-
/* Helper Header */
#include <reactos/helper.h>