Changeset 129 in vbox

Timestamp:

Jan 18, 2007 12:07:02 AM (18 years ago)

Author:

vboxsync

Message:

Generic Uuid. Corrected Gen.u16TimeMin to Gen.u16TimeMid.

Location:

trunk

Files:

• include/iprt/types.h (modified) (1 diff)
• src/VBox/Runtime/Makefile (modified) (3 diffs)
• src/VBox/Runtime/VBox/strformat-vbox.cpp (modified) (1 diff)
• src/VBox/Runtime/generic/uuid-generic.cpp (added)
• src/VBox/Runtime/strformatrt.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/Makefile (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstUuid.cpp (added)

trunk/include/iprt/types.h

@@ -986 +986 @@
     {
         uint32_t    u32TimeLow;
-        uint16_t    u16TimeMin;
+        uint16_t    u16TimeMid;
         uint16_t    u16TimeHiAndVersion;
         uint16_t    u16ClockSeq;

trunk/src/VBox/Runtime/Makefile

@@ -101 +101 @@
 ifdef IPRT_WITH_KLDR
  RuntimeR3_DEFS        += LDR_WITH_KLDR KLDR_USE_CRT
- RuntimeR3_DEFS.debug  += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT 
+ RuntimeR3_DEFS.debug  += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
 endif
 RuntimeR3_DEFS.l4       = L4
@@ -113 +113 @@
         $(IPRT_PATH_KLDR)
 endif
-RuntimeR3_INCS.os2      = \
-        $(PATH_ROOT)/src/libs/libuuid
 RuntimeR3_INCS.l4       = \
         $(PATH_ROOT)/src/libs/libuuid \
@@ -272 +270 @@
         generic/semnoint-generic.cpp \
         generic/sched-generic.cpp \
+        generic/uuid-generic.cpp \
         os2/RTErrConvertFromOS2.cpp \
-        r3/linux/uuid-linux.cpp \
         r3/os2/sems-os2.cpp \
         r3/os2/system-os2.cpp \

trunk/src/VBox/Runtime/VBox/strformat-vbox.cpp

@@ -416 +416 @@
                                            "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                                            pUuid->Gen.u32TimeLow,
-                                           pUuid->Gen.u16TimeMin,
+                                           pUuid->Gen.u16TimeMid,
                                            pUuid->Gen.u16TimeHiAndVersion,
                                            pUuid->Gen.u16ClockSeq & 0xff,

trunk/src/VBox/Runtime/strformatrt.cpp

@@ -419 +419 @@
                                                "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                                                u.pUuid->Gen.u32TimeLow,
-                                               u.pUuid->Gen.u16TimeMin,
+                                               u.pUuid->Gen.u16TimeMid,
                                                u.pUuid->Gen.u16TimeHiAndVersion,
                                                u.pUuid->Gen.u16ClockSeq & 0xff,

trunk/src/VBox/Runtime/testcase/Makefile

@@ -50 +50 @@
         tstUtf8 \
         tstDeadlock \
+        tstUuid \
         tstErrUnique
 PROGRAMS.win = \
@@ -173 +174 @@
 tstDeadlock_SOURCES = tstDeadlock.cpp
 
+tstUuid_SOURCES = tstUuid.cpp
+
 tstErrUnique_SOURCES = tstErrUnique.cpp
 tstErrUnique_INCS    = $(PATH_TARGET)/..