Fix some ntoskrnl things, like using Rtl instead of RosRtl, and undefining ROUND macros Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____
Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -16,8 +16,6 @@
/* GLOBALS *******************************************************************/
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - static PFN_TYPE CcZeroPage = 0;
#define MAX_ZERO_LENGTH (256 * 1024) _____
Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -16,8 +16,6 @@
/* GLOBALS *******************************************************************/
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - extern NPAGED_LOOKASIDE_LIST iBcbLookasideList;
/* FUNCTIONS *****************************************************************/ _____
Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -20,8 +20,6 @@
/* LOCAL MACROS *************************************************************/
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V))
BOOLEAN CmiDoVerify = FALSE; _____
Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -650,7 +650,7 @@
DPRINT("Link target '%S'\n", TargetNameBuffer);
- RtlRosInitUnicodeStringFromLiteral(&LinkName, + RtlInitUnicodeString(&LinkName,
L"\Registry\Machine\SYSTEM\CurrentControlSet"); InitializeObjectAttributes(&ObjectAttributes, &LinkName, @@ -670,7 +670,7 @@ return(Status); }
- RtlRosInitUnicodeStringFromLiteral(&LinkValue, + RtlInitUnicodeString(&LinkValue, L"SymbolicLinkValue"); Status = ZwSetValueKey(KeyHandle, &LinkValue, @@ -925,7 +925,7 @@ NTSTATUS Status;
/* Create 'ControlSet001' key */ - RtlRosInitUnicodeStringFromLiteral (&ControlSetKeyName, + RtlInitUnicodeString(&ControlSetKeyName,
L"\Registry\Machine\SYSTEM\ControlSet001"); InitializeObjectAttributes (&ObjectAttributes, &ControlSetKeyName, @@ -947,7 +947,7 @@ ZwClose (KeyHandle);
/* Link 'CurrentControlSet' to 'ControlSet001' key */ - RtlRosInitUnicodeStringFromLiteral (&ControlSetLinkName, + RtlInitUnicodeString (&ControlSetLinkName,
L"\Registry\Machine\SYSTEM\CurrentControlSet"); InitializeObjectAttributes (&ObjectAttributes, &ControlSetLinkName, @@ -967,7 +967,7 @@ return Status; }
- RtlRosInitUnicodeStringFromLiteral (&ControlSetValueName, + RtlInitUnicodeString (&ControlSetValueName, L"SymbolicLinkValue"); Status = ZwSetValueKey (KeyHandle, &ControlSetValueName, @@ -1008,7 +1008,7 @@
if (SetupBoot == TRUE) { - RtlRosInitUnicodeStringFromLiteral(&KeyName, + RtlInitUnicodeString(&KeyName, L"\Registry\Machine\HARDWARE"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -1024,7 +1024,7 @@ return(Status); }
- RtlRosInitUnicodeStringFromLiteral(&ValueName, + RtlInitUnicodeString(&ValueName, L"InstallPath");
BufferSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 4096; _____
Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -674,7 +674,7 @@
PKEY_CELL KeyCell, PUNICODE_STRING TargetPath) { - UNICODE_STRING LinkName = ROS_STRING_INITIALIZER(L"SymbolicLinkValue"); + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); PVALUE_CELL ValueCell; PDATA_CELL DataCell; NTSTATUS Status; _____
Modified: trunk/reactos/ntoskrnl/ex/callback.c --- trunk/reactos/ntoskrnl/ex/callback.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/ex/callback.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -65,7 +65,7 @@
}
/* Initialize the Object */ - RtlRosInitUnicodeStringFromLiteral(&DirName, L"\Callback" ); + RtlInitUnicodeString(&DirName, L"\Callback" ); InitializeObjectAttributes( &ObjectAttributes, &DirName, _____
Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-19 07:11:38 UTC (rev 16077) @@ -222,19 +222,6 @@
#define IPI_REQUEST_DPC 2 #define IPI_REQUEST_FREEZE 3
-#ifndef __USE_W32API -typedef enum _KTHREAD_STATE { - Initialized, - Ready, - Running, - Standby, - Terminated, - Waiting, - Transition, - DeferredReady, -} THREAD_STATE, *PTHREAD_STATE; -#endif - /* MACROS ************************************************************************ */
#define KeEnterCriticalRegion(X) \ _____
Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-19 07:11:38 UTC (rev 16077) @@ -55,6 +55,13 @@
BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); VOID KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock);
+BOOLEAN +FASTCALL +RtlpCreateUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source, + IN POOL_TYPE PoolType); + #endif /* __ASM__ */
/* _____
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-19 07:11:38 UTC (rev 16077) @@ -74,4 +74,7 @@
#include <napi/teb.h> #include <napi/win32.h>
+ +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #endif /* INCLUDE_NTOSKRNL_H */ _____
Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -62,6 +62,7 @@
{ KIRQL oldIrql;
+ //KeRaiseIrql(Interrupt->SynchronizeIrql, &oldIrql); KeRaiseIrql(Interrupt->SynchLevel, &oldIrql); KiAcquireSpinLock(Interrupt->ActualLock); return oldIrql;