[ros-diffs] [weiden] 24765: Fix some compilation errors
weiden at svn.reactos.org
weiden at svn.reactos.org
Wed Nov 15 21:24:56 CET 2006
Author: weiden
Date: Wed Nov 15 23:24:55 2006
New Revision: 24765
URL: http://svn.reactos.org/svn/reactos?rev=24765&view=rev
Log:
Fix some compilation errors
Modified:
trunk/reactos/hal/halx86/generic/processor.c
trunk/reactos/include/ddk/winddk.h
trunk/reactos/include/ndk/exfuncs.h
trunk/reactos/include/ndk/psfuncs.h
trunk/reactos/ntoskrnl/dbgk/dbgkutil.c
trunk/reactos/ntoskrnl/dbgk/debug.c
trunk/reactos/ntoskrnl/fs/filelock.c
trunk/reactos/ntoskrnl/fstub/disksup.c
Modified: trunk/reactos/hal/halx86/generic/processor.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/processor.c?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/processor.c (original)
+++ trunk/reactos/hal/halx86/generic/processor.c Wed Nov 15 23:24:55 2006
@@ -31,7 +31,7 @@
/* Update the interrupt affinity and processor mask */
InterlockedBitTestAndSet(&HalpActiveProcessors, ProcessorNumber);
- InterlockedBitTestAndSet(&HalpDefaultInterruptAffinity, ProcessorNumber);
+ InterlockedBitTestAndSet((PLONG)&HalpDefaultInterruptAffinity, ProcessorNumber);
/* FIXME: Register routines for KDCOM */
}
Modified: trunk/reactos/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddk.h (original)
+++ trunk/reactos/include/ddk/winddk.h Wed Nov 15 23:24:55 2006
@@ -7037,12 +7037,6 @@
OUT PLARGE_INTEGER LocalTime);
NTKERNELAPI
-BOOLEAN
-NTAPI
-ExTryToAcquireResourceExclusiveLite(
- IN PERESOURCE Resource);
-
-NTKERNELAPI
VOID
NTAPI
ExUnregisterCallback(
Modified: trunk/reactos/include/ndk/exfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/include/ndk/exfuncs.h (original)
+++ trunk/reactos/include/ndk/exfuncs.h Wed Nov 15 23:24:55 2006
@@ -96,6 +96,7 @@
//
// Resource Functions
//
+NTKERNELAPI
BOOLEAN
NTAPI
ExTryToAcquireResourceExclusiveLite(
@@ -151,6 +152,7 @@
IN POBJECT_ATTRIBUTES ObjectAttributes
);
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtCreateKeyedEvent(
@@ -205,7 +207,7 @@
IN PUNICODE_STRING DisplayString
);
-
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtEnumerateSystemEnvironmentValuesEx(
@@ -361,6 +363,7 @@
PULONG ReturnLength
);
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtQuerySystemEnvironmentValueEx(
@@ -509,6 +512,7 @@
IN PUNICODE_STRING Value
);
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtSetSystemEnvironmentValueEx(
Modified: trunk/reactos/include/ndk/psfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/include/ndk/psfuncs.h (original)
+++ trunk/reactos/include/ndk/psfuncs.h Wed Nov 15 23:24:55 2006
@@ -30,24 +30,28 @@
//
// Win32K Process/Thread Functions
//
+NTKERNELAPI
struct _W32THREAD*
NTAPI
PsGetCurrentThreadWin32Thread(
VOID
);
+NTKERNELAPI
struct _W32PROCESS*
NTAPI
PsGetCurrentProcessWin32Process(
VOID
);
+NTKERNELAPI
PVOID
NTAPI
PsGetProcessWin32Process(
PEPROCESS Process
);
+NTKERNELAPI
VOID
NTAPI
PsSetProcessWin32Process(
@@ -55,6 +59,7 @@
PVOID Win32Process
);
+NTKERNELAPI
VOID
NTAPI
PsSetThreadWin32Thread(
@@ -62,18 +67,21 @@
PVOID Win32Thread
);
+NTKERNELAPI
PVOID
NTAPI
PsGetThreadWin32Thread(
PETHREAD Thread
);
+NTKERNELAPI
BOOLEAN
NTAPI
PsGetThreadHardErrorsAreDisabled(
PETHREAD Thread
);
+NTKERNELAPI
VOID
NTAPI
PsSetThreadHardErrorsAreDisabled(
@@ -81,12 +89,14 @@
IN BOOLEAN Disabled
);
+NTKERNELAPI
VOID
NTAPI
PsEstablishWin32Callouts(
PWIN32_CALLOUTS_FPNS CalloutData
);
+NTKERNELAPI
VOID
NTAPI
PsReturnProcessNonPagedPoolQuota(
@@ -97,6 +107,7 @@
//
// Process Impersonation Functions
//
+NTKERNELAPI
VOID
NTAPI
PsRevertThreadToSelf(
@@ -106,10 +117,12 @@
//
// Misc. Functions
//
+NTKERNELAPI
HANDLE
NTAPI
PsGetProcessId(PEPROCESS Process);
+NTKERNELAPI
NTSTATUS
NTAPI
PsLookupProcessThreadByCid(
@@ -132,6 +145,7 @@
);
typedef ULONG APPHELPCACHESERVICECLASS;
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtApphelpCacheControl(
Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original)
+++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Wed Nov 15 23:24:55 2006
@@ -104,7 +104,7 @@
PAGED_CODE();
/* Check if this process has already been notified */
- ProcessFlags = InterlockedAnd(&Process->Flags,
+ ProcessFlags = InterlockedAnd((PLONG)&Process->Flags,
PSF_CREATE_REPORTED_BIT |
PSF_IMAGE_NOTIFY_DONE_BIT);
if (!(ProcessFlags & PSF_IMAGE_NOTIFY_DONE_BIT) && (PsImageNotifyEnabled))
Modified: trunk/reactos/ntoskrnl/dbgk/debug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/dbgk/debug.c (original)
+++ trunk/reactos/ntoskrnl/dbgk/debug.c Wed Nov 15 23:24:55 2006
@@ -1055,8 +1055,9 @@
else
{
/* Set the process flags */
- InterlockedOr(&Process->Flags, PSF_NO_DEBUG_INHERIT_BIT |
- PSF_CREATE_REPORTED_BIT);
+ InterlockedOr((PLONG)&Process->Flags,
+ PSF_NO_DEBUG_INHERIT_BIT |
+ PSF_CREATE_REPORTED_BIT);
/* Reference the debug object */
ObDereferenceObject(DebugObject);
Modified: trunk/reactos/ntoskrnl/fs/filelock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/filelock.c?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fs/filelock.c (original)
+++ trunk/reactos/ntoskrnl/fs/filelock.c Wed Nov 15 23:24:55 2006
@@ -1068,7 +1068,7 @@
/* Acquire cancel spinlock and clear the cancel routine */
IoAcquireCancelSpinLock(&Irp->CancelIrql);
- IoSetCancelRoutine(Irp, NULL);
+ (void)IoSetCancelRoutine(Irp, NULL);
IoReleaseCancelSpinLock(Irp->CancelIrql);
/* Complete the IRP */
Modified: trunk/reactos/ntoskrnl/fstub/disksup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?rev=24765&r1=24764&r2=24765&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fstub/disksup.c (original)
+++ trunk/reactos/ntoskrnl/fstub/disksup.c Wed Nov 15 23:24:55 2006
@@ -1329,7 +1329,8 @@
PDRIVE_LAYOUT_INFORMATION DriveLayoutInfo = NULL;
LONG j = -1, i = -1, k;
DISK_GEOMETRY DiskGeometry;
- LONGLONG EndSector, MaxSector, StartOffset, MaxOffset;
+ LONGLONG EndSector, MaxSector, StartOffset;
+ ULONGLONG MaxOffset;
LARGE_INTEGER Offset, VolumeOffset;
BOOLEAN IsPrimary = TRUE, IsEzDrive = FALSE, MbrFound = FALSE;
BOOLEAN IsValid, IsEmpty = TRUE;
More information about the Ros-diffs
mailing list