[ros-diffs] [ion] 16114: User helper header and don't use RTLROS string macros naymore

User helper header and don't use RTLROS string macros naymore
Modified: trunk/reactos/lib/ntdll/csr/lpc.c
Modified: trunk/reactos/lib/ntdll/dbg/debug.c
Modified: trunk/reactos/lib/ntdll/inc/ntdll.h
Modified: trunk/reactos/lib/ntdll/ldr/startup.c
  _____  

Modified: trunk/reactos/lib/ntdll/csr/lpc.c
--- trunk/reactos/lib/ntdll/csr/lpc.c	2005-06-19 21:03:41 UTC (rev
16113)
+++ trunk/reactos/lib/ntdll/csr/lpc.c	2005-06-19 21:08:39 UTC (rev
16114)
@@ -114,7 +114,7 @@

 CsrClientConnectToServer(VOID)
 {
    NTSTATUS Status;
-   UNICODE_STRING PortName;
+   UNICODE_STRING PortName =
RTL_CONSTANT_STRING(L"\\Windows\\ApiPort");
    ULONG ConnectInfoLength;
    CSRSS_API_REQUEST Request;
    CSRSS_API_REPLY Reply;
@@ -139,7 +139,6 @@
      {
        return(Status);
      }
-   RtlRosInitUnicodeStringFromLiteral(&PortName,
L"\\Windows\\ApiPort");
    ConnectInfoLength = 0;
    LpcWrite.Length = sizeof(LPC_SECTION_WRITE);
    LpcWrite.SectionHandle = CsrSectionHandle;
  _____  

Modified: trunk/reactos/lib/ntdll/dbg/debug.c
--- trunk/reactos/lib/ntdll/dbg/debug.c	2005-06-19 21:03:41 UTC (rev
16113)
+++ trunk/reactos/lib/ntdll/dbg/debug.c	2005-06-19 21:08:39 UTC (rev
16114)
@@ -82,7 +82,7 @@

 		ULONG Unknown3)
 {
 	SECURITY_QUALITY_OF_SERVICE Qos;
-	UNICODE_STRING PortName =
ROS_STRING_INITIALIZER(L"\\DbgSsApiPort");
+	UNICODE_STRING PortName =
RTL_CONSTANT_STRING(L"\\DbgSsApiPort");
 	NTSTATUS Status;
 
 	Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE);
@@ -128,7 +128,7 @@
 DbgUiConnectToDbg(VOID)
 {
 	SECURITY_QUALITY_OF_SERVICE Qos;
-	UNICODE_STRING PortName =
ROS_STRING_INITIALIZER(L"\\DbgUiApiPort");
+	UNICODE_STRING PortName =
RTL_CONSTANT_STRING(L"\\DbgUiApiPort");
 	NTSTATUS Status;
 	PTEB Teb;
 	ULONG InfoSize;
  _____  

Modified: trunk/reactos/lib/ntdll/inc/ntdll.h
--- trunk/reactos/lib/ntdll/inc/ntdll.h	2005-06-19 21:03:41 UTC (rev
16113)
+++ trunk/reactos/lib/ntdll/inc/ntdll.h	2005-06-19 21:08:39 UTC (rev
16114)
@@ -13,6 +13,9 @@

 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 
+/* Helper Macros */
+#include <reactos/helper.h>
+
 /* NTDLL Public Headers. FIXME: Combine/clean these after NDK */
 #include <ntdll/csr.h>
 #include <ntdll/rtl.h>
@@ -20,17 +23,4 @@
 #include <ntdll/ntdll.h>
 #include <debug.h> /* FIXME REMOVE THIS */
 
-/* ROSRTL Headers */
-#include <rosrtl/string.h> /* FIXME: KILL ROSRTL */
-
-/* Helper Macros FIXME: NDK */
-#define ROUNDUP(a,b)    ((((a)+(b)-1)/(b))*(b))
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
-#ifndef HIWORD
-#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
-#endif
-#ifndef LOWORD
-#define LOWORD(l) ((WORD)(l))
-#endif
-
 /* EOF */
  _____  

Modified: trunk/reactos/lib/ntdll/ldr/startup.c
--- trunk/reactos/lib/ntdll/ldr/startup.c	2005-06-19 21:03:41 UTC
(rev 16113)
+++ trunk/reactos/lib/ntdll/ldr/startup.c	2005-06-19 21:08:39 UTC
(rev 16114)
@@ -105,7 +105,8 @@

 	HANDLE KeyHandle;
 	HANDLE SubKeyHandle;
 	OBJECT_ATTRIBUTES ObjectAttributes;
-	UNICODE_STRING KeyName;
+	UNICODE_STRING KeyName = RTL_CONSTANT_STRING(
+    L"Software\\Microsoft\\Windows
NT\\CurrentVersion\\AppCompatFlags\\Layers");
 	UNICODE_STRING ValueName;
 	UCHAR ValueBuffer[VALUE_BUFFER_SIZE];
 	PKEY_VALUE_PARTIAL_INFORMATION ValueInfo;
@@ -123,9 +124,6 @@
 			return FALSE;
 		}
 
-		RtlRosInitUnicodeStringFromLiteral(&KeyName,
-			L"Software\\Microsoft\\Windows
NT\\CurrentVersion\\AppCompatFlags\\Layers");
-
 		InitializeObjectAttributes(&ObjectAttributes,
 			&KeyName,
 			OBJ_CASE_INSENSITIVE,