Author: fireball
Date: Sat Jul 18 15:37:05 2009
New Revision: 42050
URL:
http://svn.reactos.org/svn/reactos?rev=42050&view=rev
Log:
- Include csr.c into the build.
- Temporarily add EngGetTickCount implementation to winesup.c.
- win32k now fully builds.
Modified:
branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild
branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Jul 18
15:37:05 2009
@@ -24,6 +24,7 @@
<pch>win32k.h</pch>
</directory>
<directory name="main">
+ <file>csr.c</file>
<file>err.c</file>
<file>init.c</file>
<file>usrheap.c</file>
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Sat Jul
18 15:37:05 2009
@@ -181,4 +181,20 @@
return NewPtr;
}
+ULONGLONG
+APIENTRY
+EngGetTickCount(VOID)
+{
+ ULONG Multiplier;
+ LARGE_INTEGER TickCount;
+
+ /* Get the multiplier and current tick count */
+ KeQueryTickCount(&TickCount);
+ Multiplier = SharedUserData->TickCountMultiplier;
+
+ /* Convert to milliseconds and return */
+ return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
+ (Multiplier * (TickCount.HighPart << 8)));
+}
+
/* EOF */