Changeset 78124 in vbox for trunk

Timestamp:

Apr 15, 2019 2:29:49 PM (6 years ago)

Author:

vboxsync

Message:

Main: Machine+VirtualBox: slightly prettier fix to bugref:9075, including comment adjustments

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (2 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2818 +2818 @@
         Sets associated global extra data.
 
-        If you pass @c null or empty string as a key @a value, the given @a key
-        will be deleted.
+        If you pass @c null or an empty string as a key @a value, the given
+        @a key will be deleted.
 
         <note>
-          Key must contain only printable ASCII characters.
+          Key must contain printable (non-control) UTF-8 characters only.
         </note>
         <note>
           Before performing the actual data change, this method will ask all
-          registered event listener using the
+          registered event listeners using the
           <link to="IExtraDataCanChangeEvent"/>
           notification for a permission. If one of the listeners refuses the
@@ -7334 +7334 @@
 
         <note>
-          Key must contain only printable ASCII characters.
+          Key must contain printable (non-control) UTF-8 characters only.
         </note>
         <note>
           Before performing the actual data change, this method will ask all
-          registered listeners using the
+          registered event listeners using the
           <link to="IExtraDataCanChangeEvent"/>
           notification for a permission. If one of the listeners refuses the

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -4838 +4838 @@
 HRESULT Machine::setExtraData(const com::Utf8Str &aKey, const com::Utf8Str &aValue)
 {
-    /* Because non-ASCII characters in aKey have caused problems in the settings
+    /* Because control characters in aKey have caused problems in the settings
      * they are rejected unless the key should be deleted. */
     if (!aValue.isEmpty())
@@ -4845 +4845 @@
         {
             char ch = aKey[i];
-            if (RT_C_IS_CNTRL(ch))
+            if (RTLocCIsCntrl(ch))
                 return E_INVALIDARG;
         }

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -126 +126 @@
 // static leaked (todo: find better place to free it.)
 RWLockHandle *VirtualBox::spMtxNatNetworkNameToRefCountLock;
+
+
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -2142 +2144 @@
     HRESULT rc = S_OK;
 
-    /* Because non-ASCII characters in aKey have caused problems in the settings
+    /* Because control characters in aKey have caused problems in the settings
      * they are rejected unless the key should be deleted. */
     if (!strValue.isEmpty())
@@ -2149 +2151 @@
         {
             char ch = strKey[i];
-            if (RT_C_IS_CNTRL(ch))
+            if (RTLocCIsCntrl(ch))
                 return E_INVALIDARG;
         }