Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 78123)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 78124)
@@ -2818,13 +2818,13 @@
         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,9 +7334,9 @@
 
         <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
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 78123)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 78124)
@@ -4838,5 +4838,5 @@
 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,5 +4845,5 @@
         {
             char ch = aKey[i];
-            if (RT_C_IS_CNTRL(ch))
+            if (RTLocCIsCntrl(ch))
                 return E_INVALIDARG;
         }
Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 78123)
+++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 78124)
@@ -126,4 +126,6 @@
 // static leaked (todo: find better place to free it.)
 RWLockHandle *VirtualBox::spMtxNatNetworkNameToRefCountLock;
+
+
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -2142,5 +2144,5 @@
     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,5 +2151,5 @@
         {
             char ch = strKey[i];
-            if (RT_C_IS_CNTRL(ch))
+            if (RTLocCIsCntrl(ch))
                 return E_INVALIDARG;
         }