Changeset 44039 in vbox for trunk/include/VBox/com

Timestamp:

Dec 5, 2012 12:08:52 PM (12 years ago)

Author:

vboxsync

Message:

Main: renavation com::Guid class. PR5744

File:

• trunk/include/VBox/com/Guid.h (modified) (18 diffs)

trunk/include/VBox/com/Guid.h

@@ -48 +48 @@
 {
 
+typedef enum
+    {
+        ZERO_GUID,
+        NORMAL_GUID,
+        INVALID_GUID
+    }GuidState_t;
+
 /**
  *  Helper class that represents the UUID type and hides platform-specific
@@ -60 +67 @@
         ::RTUuidClear(&mUuid);
         refresh();
+        mGuidState = ZERO_GUID;
     }
 
@@ -66 +74 @@
         mUuid = that.mUuid;
         refresh();
+        if (isEmpty())
+            mGuidState = ZERO_GUID;
+        else
+            mGuidState = NORMAL_GUID;
     }
 
@@ -72 +84 @@
         mUuid = that;
         refresh();
+        if (isEmpty())
+            mGuidState = ZERO_GUID;
+        else
+            mGuidState = NORMAL_GUID;
     }
 
@@ -79 +95 @@
         ::memcpy(&mUuid, &that, sizeof(GUID));
         refresh();
+        if (isEmpty())
+            mGuidState = ZERO_GUID;
+        else
+            mGuidState = NORMAL_GUID;
     }
 
@@ -92 +112 @@
     Guid(const char *that)
     {
+        mGuidState = NORMAL_GUID;
+
         int rc = ::RTUuidFromStr(&mUuid, that);
+
         if (RT_FAILURE(rc))
+        {
             ::RTUuidClear(&mUuid);
+            mGuidState = INVALID_GUID;
+        }
+        else if(isEmpty())
+            mGuidState = ZERO_GUID;
         refresh();
     }
@@ -109 +137 @@
     Guid(const Bstr &that)
     {
-        int rc = !that.isEmpty()
-               ? ::RTUuidFromUtf16(&mUuid, that.raw())
-               : VERR_INVALID_UUID_FORMAT;
+        mGuidState = NORMAL_GUID;
+
+        if (that.isEmpty())
+        {
+            ::RTUuidClear(&mUuid);
+            mGuidState = ZERO_GUID;
+        }
+        else
+        {
+            int rc = ::RTUuidFromUtf16(&mUuid, that.raw());
+            if (RT_FAILURE(rc))
+            {
+                ::RTUuidClear(&mUuid);
+                mGuidState = INVALID_GUID;
+            }
+        }
+
+        refresh();
+    }
+
+    Guid& operator=(const Guid &that)
+    {
+        mGuidState = NORMAL_GUID;
+        ::memcpy(&mUuid, &that.mUuid, sizeof (RTUUID));
+        if (isEmpty())
+            mGuidState = ZERO_GUID;
+        refresh();
+        return *this;
+    }
+    Guid& operator=(const GUID &guid)
+    {
+        mGuidState = NORMAL_GUID;
+        ::memcpy(&mUuid, &guid, sizeof (GUID));
+        if (isEmpty())
+            mGuidState = ZERO_GUID;
+        refresh();
+        return *this;
+    }
+    Guid& operator=(const RTUUID &guid)
+    {
+        mGuidState = NORMAL_GUID;
+        ::memcpy(&mUuid, &guid, sizeof (RTUUID));
+        if (isEmpty())
+            mGuidState = ZERO_GUID;
+        refresh();
+        return *this;
+    }
+    Guid& operator=(const char *str)
+    {
+        mGuidState = NORMAL_GUID;
+        int rc = ::RTUuidFromStr(&mUuid, str);
+
         if (RT_FAILURE(rc))
+        {
             ::RTUuidClear(&mUuid);
-        refresh();
-    }
-
-    Guid& operator=(const Guid &that)
-    {
-        ::memcpy(&mUuid, &that.mUuid, sizeof (RTUUID));
-        refresh();
-        return *this;
-    }
-    Guid& operator=(const GUID &guid)
-    {
-        ::memcpy(&mUuid, &guid, sizeof (GUID));
-        refresh();
-        return *this;
-    }
-    Guid& operator=(const RTUUID &guid)
-    {
-        ::memcpy(&mUuid, &guid, sizeof (RTUUID));
-        refresh();
-        return *this;
-    }
-    Guid& operator=(const char *str)
-    {
-        int rc = ::RTUuidFromStr(&mUuid, str);
-        if (RT_FAILURE(rc))
-            ::RTUuidClear(&mUuid);
-        refresh();
+            mGuidState = INVALID_GUID;
+        }
+        else 
+        {
+            if (isEmpty())
+            mGuidState = ZERO_GUID;
+        }
+
+        refresh();
+
         return *this;
     }
@@ -147 +208 @@
     {
         ::RTUuidCreate(&mUuid);
+        mGuidState = NORMAL_GUID;
         refresh();
     }
@@ -152 +214 @@
     {
         ::RTUuidClear(&mUuid);
+        mGuidState = ZERO_GUID;
         refresh();
     }
@@ -164 +227 @@
     {
         char buf[RTUUID_STR_LENGTH];
+
+        ::memset(buf,0,RTUUID_STR_LENGTH);
+
+        if (mGuidState == INVALID_GUID)
+        {
+            /* What to return in case of wrong Guid */
+            return Utf8Str("00000000-0000-0000-0000-00000000000");
+        }
+
         ::RTUuidToStr(&mUuid, buf, RTUUID_STR_LENGTH);
+
+
         return Utf8Str(buf);
     }
@@ -176 +250 @@
     Utf8Str toStringCurly() const
     {
+
+        if (mGuidState == INVALID_GUID)
+        {
+            /* What to return in case of wrong Guid */
+            return Utf8Str("{00000000-0000-0000-0000-00000000000}");
+        }
+
         char buf[RTUUID_STR_LENGTH + 2] = "{";
+
         ::RTUuidToStr(&mUuid, buf + 1, RTUUID_STR_LENGTH);
         buf[sizeof(buf) - 2] = '}';
         buf[sizeof(buf) - 1] = '\0';
+
         return Utf8Str(buf);
     }
@@ -191 +274 @@
     Bstr toUtf16() const
     {
-        if (isEmpty())
-          return Bstr();
+        if (mGuidState == INVALID_GUID)
+          return Bstr("00000000-0000-0000-0000-00000000000");
 
         RTUTF16 buf[RTUUID_STR_LENGTH];
@@ -199 +282 @@
     }
 
-    bool isEmpty() const
-    {
-        return ::RTUuidIsNull(&mUuid);
-    }
-
-    bool isNotEmpty() const
-    {
-        return !::RTUuidIsNull(&mUuid);
+    bool isValid() const
+    {
+        bool res = true;
+        if (mGuidState == INVALID_GUID)
+            res = false;
+
+        return res;
+    }
+
+    bool isZero() const
+    {
+        return (::RTUuidIsNull(&mUuid) && mGuidState == ZERO_GUID);
     }
 
@@ -257 +344 @@
         if (ppGuid)
             *ppGuid = (nsID *)nsMemory::Clone(&mUuid, sizeof(nsID));
+
         return *this;
     }
@@ -309 +397 @@
     static const Guid Empty;
 
+protected:
+
+    bool isEmpty() const
+    {
+        return ::RTUuidIsNull(&mUuid);
+    }
+
+    bool isNotEmpty() const
+    {
+        return !::RTUuidIsNull(&mUuid);
+    }
+
 private:
     /**
@@ -327 +427 @@
     /** The UUID. */
     RTUUID mUuid;
+
+    GuidState_t mGuidState;
 
 #ifdef DEBUG
@@ -335 +437 @@
 #endif
 };
-
+/*
 inline Bstr asGuidStr(const Bstr& str)
 {
@@ -341 +443 @@
    return guid.isEmpty() ? Bstr() : guid.toUtf16();
 }
-
+*/
 inline bool isValidGuid(const Bstr& str)
 {
    Guid guid(str);
-   return !guid.isEmpty();
+   return guid.isValid();
+//   return !guid.isEmpty();
 }