Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-16 15:50:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KS/NTOSKRNL/WIN32K] Fix MSVC warnings

Browse source 
[WMILIB] Don't put it in a cab file, so we can use it in first stage
[DDK/VDDSVC.H] use the 16 bit interface only on MIPS
[WINE/PORT.H] WIN32 -> _WIN32
[NTOSKRNL] KfAcquire/ReleaseSpinLock -> KeAcquire/ReleaseSpinLock
[NTOSKRNL] Make sure KeUpdateSystemTime returns properly on non-x86 builds

svn path=/trunk/; revision=63220
This commit is contained in:
Timo Kreuzer 2014-05-10 14:33:37 +00:00
parent a74ecc13fd
commit 2b89f1925e
11 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/ksfilter/ks/topology.c
View file

@ -28,7 +28,7 @@ KspCreateObjectType(
/* calculate request length */
Name.Length = 0;
Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 1 * sizeof(WCHAR);
Name.MaximumLength = (USHORT)(wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 1 * sizeof(WCHAR));
Name.MaximumLength += sizeof(WCHAR);
/* acquire request buffer */
Name.Buffer = AllocateItem(NonPagedPool, Name.MaximumLength);
@ -39,7 +39,7 @@ KspCreateObjectType(
return STATUS_INSUFFICIENT_RESOURCES;
}
/* build a request which looks like {ObjectClass}\CreateParameters
/* build a request which looks like {ObjectClass}\CreateParameters
* For pins the parent is the reference string used in registration
* For clocks it is full path for pin\{ClockGuid}\ClockCreateParams
*/

2
reactos/drivers/wmi/CMakeLists.txt
View file

@ -12,4 +12,4 @@ set_module_type(wmilib kernelmodedriver ENTRYPOINT 0)
add_importlibs(wmilib ntoskrnl)
add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers FOR all)
add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers NO_CAB FOR all)

2
reactos/include/ddk/vddsvc.h
View file

@ -50,7 +50,7 @@ call_ica_hw_interrupt
*/
PVOID WINAPI getIntelRegistersPointer(VOID);
#ifdef __i386__
#ifndef _M_MIPS
ULONG WINAPI getEAX(VOID);
VOID WINAPI setEAX(ULONG);

2
reactos/include/reactos/wine/port.h
View file

@ -278,7 +278,7 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset );
#endif /* HAVE_PWRITE */
#endif /* __REACTOS__ */
#ifdef WIN32
#ifdef _WIN32
#ifndef HAVE_SIGSETJMP
# include <setjmp.h>
typedef jmp_buf sigjmp_buf;

8
reactos/ntoskrnl/ex/sysinfo.c
View file

@ -1964,7 +1964,7 @@ QSI_DEF(SystemLookasideInformation)
}
/* Acquire spinlock for ExpNonPagedLookasideListHead */
OldIrql = KfAcquireSpinLock(&ExpNonPagedLookasideListLock);
KeAcquireSpinLock(&ExpNonPagedLookasideListLock, &OldIrql);
/* Copy info from non-paged lookaside lists */
ExpCopyLookasideInformation(&Info,
@ -1973,7 +1973,7 @@ QSI_DEF(SystemLookasideInformation)
TRUE);
/* Release spinlock for ExpNonPagedLookasideListHead */
KfReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql);
KeReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql);
if (Remaining == 0)
{
@ -1981,7 +1981,7 @@ QSI_DEF(SystemLookasideInformation)
}
/* Acquire spinlock for ExpPagedLookasideListHead */
OldIrql = KfAcquireSpinLock(&ExpPagedLookasideListLock);
KeAcquireSpinLock(&ExpPagedLookasideListLock, &OldIrql);
/* Copy info from paged lookaside lists */
ExpCopyLookasideInformation(&Info,
@ -1990,7 +1990,7 @@ QSI_DEF(SystemLookasideInformation)
TRUE);
/* Release spinlock for ExpPagedLookasideListHead */
KfReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql);
KeReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql);
Leave:

2
reactos/ntoskrnl/include/internal/amd64/mm.h
View file

@ -296,7 +296,7 @@ MI_IS_MAPPED_PTE(PMMPTE PointerPte)
{
/// FIXME
__debugbreak();
return (PointerPte->u.Long & 0xFFFFFC01 != 0);
return ((PointerPte->u.Long & 0xFFFFFC01) != 0);
}
VOID

3
reactos/ntoskrnl/ke/time.c
View file

@ -78,6 +78,9 @@ KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame,
/* Increase interrupt count and end the interrupt */
Prcb->InterruptCount++;
KiEndInterrupt(Irql, TrapFrame);
/* Note: non-x86 return back to the caller! */
return;
}
/* Add the increment time to the shared data */

8
reactos/ntoskrnl/ps/quota.c
View file

@ -132,9 +132,9 @@ PspInsertQuotaBlock(
{
KIRQL OldIrql;
OldIrql = KfAcquireSpinLock(&PspQuotaLock);
KeAcquireSpinLock(&PspQuotaLock, &OldIrql);
InsertTailList(&PspQuotaBlockList, &QuotaBlock->QuotaList);
KfReleaseSpinLock(&PspQuotaLock, OldIrql);
KeReleaseSpinLock(&PspQuotaLock, OldIrql);
}
VOID
@ -147,9 +147,9 @@ PspDestroyQuotaBlock(PEPROCESS Process)
if (QuotaBlock != &PspDefaultQuotaBlock &&
InterlockedDecrementUL(&QuotaBlock->ReferenceCount) == 0)
{
OldIrql = KfAcquireSpinLock(&PspQuotaLock);
KeAcquireSpinLock(&PspQuotaLock, &OldIrql);
RemoveEntryList(&QuotaBlock->QuotaList);
KfReleaseSpinLock(&PspQuotaLock, OldIrql);
KeReleaseSpinLock(&PspQuotaLock, OldIrql);
ExFreePool(QuotaBlock);
}
}

2
reactos/win32ss/gdi/eng/mem.c
View file

@ -114,7 +114,7 @@ HackSecureVirtualMemory(
else if (ProbeMode == PAGE_READWRITE) Operation = IoModifyAccess;
else return NULL;
pmdl = IoAllocateMdl(Address, Size, FALSE, TRUE, NULL);
pmdl = IoAllocateMdl(Address, (ULONG)Size, FALSE, TRUE, NULL);
if (pmdl == NULL)
{
return NULL;

8
reactos/win32ss/user/ntuser/misc/rtlstr.c
View file

@ -19,11 +19,11 @@ RtlInitLargeAnsiString(
IN PCSZ SourceString,
IN INT Unknown)
{
ULONG DestSize;
USHORT DestSize;
if (SourceString)
{
DestSize = strlen(SourceString);
DestSize = (USHORT)strlen(SourceString);
DestinationString->Length = DestSize;
DestinationString->MaximumLength = DestSize + sizeof(CHAR);
}
@ -44,11 +44,11 @@ RtlInitLargeUnicodeString(
IN PCWSTR SourceString,
IN INT Unknown)
{
ULONG DestSize;
USHORT DestSize;
if (SourceString)
{
DestSize = wcslen(SourceString) * sizeof(WCHAR);
DestSize = (USHORT)wcslen(SourceString) * sizeof(WCHAR);
DestinationString->Length = DestSize;
DestinationString->MaximumLength = DestSize + sizeof(WCHAR);
}

11
reactos/win32ss/w32ksvc.h
View file

@ -1,6 +1,6 @@
// SVC_(<NAME>, <ARG_COUNT>)
//
// Funcs, order, should, match, Windows, XP, 5.1.2600, SP2)
// Funcs order should match Windows XP 5.1.2600 SP2
//
SVC_(GdiAbortDoc, 1)
SVC_(GdiAbortPath, 1)
@ -235,7 +235,7 @@ SVC_(GdiMonoBitmap, 1)
SVC_(GdiMoveTo, 4)
SVC_(GdiOffsetClipRgn, 3)
SVC_(GdiOffsetRgn, 3)
SVC_(GdiOpenDCW, 8)
SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP */
SVC_(GdiPatBlt, 6)
SVC_(GdiPolyPatBlt, 5)
SVC_(GdiPathToRegion, 1)
@ -374,8 +374,7 @@ SVC_(UserEndDeferWindowPosEx, 2)
SVC_(UserEndMenu, 0)
SVC_(UserEndPaint, 2)
SVC_(UserEnumDisplayDevices, 4)
// SVC_(UserEnumDisplayMonitors, 4, Wrong, number, of, param, ?)
SVC_(UserEnumDisplayMonitors, 5)
SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP */
SVC_(UserEnumDisplaySettings, 4)
SVC_(UserEvent, 1)
SVC_(UserExcludeUpdateRgn, 2)
@ -496,7 +495,7 @@ SVC_(UserRealInternalGetMessage, 6)
SVC_(UserRealWaitMessageEx, 2)
SVC_(UserRedrawWindow, 4)
SVC_(UserRegisterClassExWOW, 7)
SVC_(UserRegisterUserApiHook, 4)
SVC_(UserRegisterUserApiHook, 4) /* FIXME: 2 params on XP */
SVC_(UserRegisterHotKey, 4)
SVC_(UserRegisterRawInputDevices, 3)
SVC_(UserRegisterTasklist, 1)
@ -590,7 +589,7 @@ SVC_(UserUnregisterUserApiHook, 0)
SVC_(UserUnregisterHotKey, 2)
SVC_(UserUpdateInputContext, 3)
SVC_(UserUpdateInstance, 3)
SVC_(UserUpdateLayeredWindow, 10)
SVC_(UserUpdateLayeredWindow, 10) /* FIXME: 9 params on XP */
SVC_(UserGetLayeredWindowAttributes, 4)
SVC_(UserSetLayeredWindowAttributes, 4)
SVC_(UserUpdatePerUserSystemParameters, 2)