Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

User helper header and don't use RTLROS string macros naymore

Browse source 
svn path=/trunk/; revision=16114
This commit is contained in:
Alex Ionescu 2005-06-19 21:08:39 +00:00
parent 4d69a0fddb
commit a43ea85ae0
4 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/lib/ntdll/csr/lpc.c
View file

@ -114,7 +114,7 @@ NTSTATUS STDCALL
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 @@ CsrClientConnectToServer(VOID)
{
return(Status);
}
RtlRosInitUnicodeStringFromLiteral(&PortName, L"\\Windows\\ApiPort");
ConnectInfoLength = 0;
LpcWrite.Length = sizeof(LPC_SECTION_WRITE);
LpcWrite.SectionHandle = CsrSectionHandle;

4
reactos/lib/ntdll/dbg/debug.c
View file

@ -82,7 +82,7 @@ DbgSsInitialize(HANDLE ReplyPort,
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 @@ NTSTATUS STDCALL
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;

16
reactos/lib/ntdll/inc/ntdll.h
View file

@ -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 */

6
reactos/lib/ntdll/ldr/startup.c
View file

@ -105,7 +105,8 @@ LoadCompatibilitySettings(PPEB Peb)
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 @@ LoadCompatibilitySettings(PPEB Peb)
return FALSE;
}
RtlRosInitUnicodeStringFromLiteral(&KeyName,
L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers");
InitializeObjectAttributes(&ObjectAttributes,
&KeyName,
OBJ_CASE_INSENSITIVE,