[ros-diffs] [tkreuzer] 63220: [KS/NTOSKRNL/WIN32K] Fix MSVC warnings [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] WIN3...

Author: tkreuzer
Date: Sat May 10 14:33:37 2014
New Revision: 63220
URL: http://svn.reactos.org/svn/reactos?rev=63220&view=rev
Log:
[KS/NTOSKRNL/WIN32K] Fix MSVC warnings
[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
Modified:
    trunk/reactos/drivers/ksfilter/ks/topology.c
    trunk/reactos/drivers/wmi/CMakeLists.txt
    trunk/reactos/include/ddk/vddsvc.h
    trunk/reactos/include/reactos/wine/port.h
    trunk/reactos/ntoskrnl/ex/sysinfo.c
    trunk/reactos/ntoskrnl/include/internal/amd64/mm.h
    trunk/reactos/ntoskrnl/ke/time.c
    trunk/reactos/ntoskrnl/ps/quota.c
    trunk/reactos/win32ss/gdi/eng/mem.c
    trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c
    trunk/reactos/win32ss/w32ksvc.h
Modified: trunk/reactos/drivers/ksfilter/ks/topology.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/topology.c        [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/topology.c        [iso-8859-1] Sat May 10 14:33:37
2014
@@ -28,7 +28,7 @@
     /* 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 @@
         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
      */
Modified: trunk/reactos/drivers/wmi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/CMakeLists.txt…
==============================================================================
--- trunk/reactos/drivers/wmi/CMakeLists.txt    [iso-8859-1] (original)
+++ trunk/reactos/drivers/wmi/CMakeLists.txt    [iso-8859-1] Sat May 10 14:33:37 2014
@@ -12,4 +12,4 @@
 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)
Modified: trunk/reactos/include/ddk/vddsvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/vddsvc.h?rev=6…
==============================================================================
--- trunk/reactos/include/ddk/vddsvc.h  [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/vddsvc.h  [iso-8859-1] Sat May 10 14:33:37 2014
@@ -50,7 +50,7 @@
  */
 PVOID  WINAPI getIntelRegistersPointer(VOID);
-#ifdef __i386__
+#ifndef _M_MIPS
 ULONG  WINAPI getEAX(VOID);
 VOID   WINAPI setEAX(ULONG);
Modified: trunk/reactos/include/reactos/wine/port.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.…
==============================================================================
--- trunk/reactos/include/reactos/wine/port.h   [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/port.h   [iso-8859-1] Sat May 10 14:33:37 2014
@@ -278,7 +278,7 @@
 #endif /* HAVE_PWRITE */
 #endif /* __REACTOS__ */
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef HAVE_SIGSETJMP
 # include <setjmp.h>
 typedef jmp_buf sigjmp_buf;
Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat May 10 14:33:37 2014
@@ -1964,7 +1964,7 @@
     }
     /* Acquire spinlock for ExpNonPagedLookasideListHead */
-    OldIrql = KfAcquireSpinLock(&ExpNonPagedLookasideListLock);
+    KeAcquireSpinLock(&ExpNonPagedLookasideListLock, &OldIrql);
     /* Copy info from non-paged lookaside lists */
     ExpCopyLookasideInformation(&Info,
@@ -1973,7 +1973,7 @@
                                 TRUE);
     /* Release spinlock for ExpNonPagedLookasideListHead */
-    KfReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql);
+    KeReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql);
     if (Remaining == 0)
     {
@@ -1981,7 +1981,7 @@
     }
     /* Acquire spinlock for ExpPagedLookasideListHead */
-    OldIrql = KfAcquireSpinLock(&ExpPagedLookasideListLock);
+    KeAcquireSpinLock(&ExpPagedLookasideListLock, &OldIrql);
     /* Copy info from paged lookaside lists */
     ExpCopyLookasideInformation(&Info,
@@ -1990,7 +1990,7 @@
                                 TRUE);
     /* Release spinlock for ExpPagedLookasideListHead */
-    KfReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql);
+    KeReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql);
 Leave:
Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h  [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h  [iso-8859-1] Sat May 10 14:33:37
2014
@@ -296,7 +296,7 @@
 {
     /// FIXME
     __debugbreak();
-    return (PointerPte->u.Long & 0xFFFFFC01 != 0);
+    return ((PointerPte->u.Long & 0xFFFFFC01) != 0);
 }
 VOID
Modified: trunk/reactos/ntoskrnl/ke/time.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=632…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/time.c    [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/time.c    [iso-8859-1] Sat May 10 14:33:37 2014
@@ -78,6 +78,9 @@
         /* 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 */
Modified: trunk/reactos/ntoskrnl/ps/quota.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=63…
==============================================================================
--- trunk/reactos/ntoskrnl/ps/quota.c   [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ps/quota.c   [iso-8859-1] Sat May 10 14:33:37 2014
@@ -132,9 +132,9 @@
 {
     KIRQL OldIrql;
-    OldIrql = KfAcquireSpinLock(&PspQuotaLock);
+    KeAcquireSpinLock(&PspQuotaLock, &OldIrql);
     InsertTailList(&PspQuotaBlockList, &QuotaBlock->QuotaList);
-    KfReleaseSpinLock(&PspQuotaLock, OldIrql);
+    KeReleaseSpinLock(&PspQuotaLock, OldIrql);
 }
 VOID
@@ -147,9 +147,9 @@
     if (QuotaBlock != &PspDefaultQuotaBlock &&
         InterlockedDecrementUL(&QuotaBlock->ReferenceCount) == 0)
     {
-        OldIrql = KfAcquireSpinLock(&PspQuotaLock);
+        KeAcquireSpinLock(&PspQuotaLock, &OldIrql);
         RemoveEntryList(&QuotaBlock->QuotaList);
-        KfReleaseSpinLock(&PspQuotaLock, OldIrql);
+        KeReleaseSpinLock(&PspQuotaLock, OldIrql);
         ExFreePool(QuotaBlock);
     }
 }
Modified: trunk/reactos/win32ss/gdi/eng/mem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mem.c?rev=…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] Sat May 10 14:33:37 2014
@@ -114,7 +114,7 @@
     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;
Modified: trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/r…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c     [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c     [iso-8859-1] Sat May 10 14:33:37
2014
@@ -19,11 +19,11 @@
     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 @@
     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);
     }
Modified: trunk/reactos/win32ss/w32ksvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6322…
==============================================================================
--- trunk/reactos/win32ss/w32ksvc.h     [iso-8859-1] (original)
+++ trunk/reactos/win32ss/w32ksvc.h     [iso-8859-1] Sat May 10 14:33:37 2014
@@ -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_(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_(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_(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_(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)