Changeset 6408 for trunk/src

Timestamp:

Jul 30, 2001, 12:19:54 PM (24 years ago)

Author:

sandervl

Message:

rewrote time apis

Location:

trunk/src/winmm

Files:

• time.cpp (modified) (4 diffs)
• winmm.mak (modified) (2 diffs)

trunk/src/winmm/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.11 2001-03-24 13:23:48 sandervl Exp $ */
+/* $Id: time.cpp,v 1.12 2001-07-30 10:19:54 sandervl Exp $ */
 
 /*
@@ -205 +205 @@
 }
 
+ULONG OPEN32API WinGetCurrentTime(ULONG hab);
+
+inline ULONG _WinGetCurrentTime(ULONG a)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = WinGetCurrentTime(a);
+    SetFS(sel);
+
+    return yyrc;
+} 
+
+#undef  WinGetCurrentTime
+#define WinGetCurrentTime _WinGetCurrentTime
 
 /*****************************************************************************
@@ -219 +234 @@
 
 ODINFUNCTION2(MMRESULT, timeGetSystemTime,
-              LPMMTIME, arg1,
-              UINT,     arg2)
-{
-  dprintf2(("timeGetSystemTime %x %d", arg1, arg2));
-  return O32_timeGetSystemTime(arg1, arg2);
+              LPMMTIME, pTime,
+              UINT,     cbTime)
+{
+  dprintf2(("timeGetSystemTime %x %d", pTime, cbTime));
+
+  if(pTime == NULL || cbTime < sizeof(MMTIME)) {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return 0;
+  }
+  pTime->wType = TIME_MS;
+  pTime->u.ms = WinGetCurrentTime(0);
+
+  SetLastError(ERROR_SUCCESS);
+  return 0;
 }
 
@@ -257 +281 @@
 #else
   //SvL: TODO: Inaccurate
-  time = O32_timeGetTime();
+  time = WinGetCurrentTime(0);
   dprintf2(("timeGetTime %x", time));
 #endif

trunk/src/winmm/winmm.mak

@@ -1 @@
-# $Id: winmm.mak,v 1.5 2001-07-29 19:00:53 sandervl Exp $
+# $Id: winmm.mak,v 1.6 2001-07-30 10:19:54 sandervl Exp $
 
 #
@@ -56 +56 @@
 #
 LIBS = \
-$(ODIN32_LIB)/pmwinx.lib \
 mmpm2.lib \
 $(ODIN32_LIB)/kernel32.lib \