Changeset 9920 in vbox

Timestamp:

Jun 25, 2008 2:19:31 PM (17 years ago)

Author:

vboxsync

Message:

Corrected hungarian spelling. Added a todo.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1565 +1565 @@
 VBGLR3DECL(int)     VbglR3DisplayChangeWaitEvent(uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits, uint32_t *piDisplay);
 VBGLR3DECL(bool)    VbglR3HostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits);
-VBGLR3DECL(int)     VbglR3SaveVideoMode(char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits);
-VBGLR3DECL(int)     VbglR3RetrieveVideoMode(char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits);
+VBGLR3DECL(int)     VbglR3SaveVideoMode(const char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits);
+VBGLR3DECL(int)     VbglR3RetrieveVideoMode(const char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits);
 /** @}  */
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -236 +236 @@
 /**
  * Save video mode parameters to the registry.
- * 
+ *
  * @returns iprt status value
  * @param   pszName the name to save the mode parameters under
@@ -243 +243 @@
  * @param   cBits   bits per pixel for the mode
  */
-VBGLR3DECL(int) VbglR3SaveVideoMode(char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits)
+VBGLR3DECL(int) VbglR3SaveVideoMode(const char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits)
 {
     using namespace svcInfo;
 
-    char pcModeName[KEY_MAX_LEN];
-    char pcModeParms[KEY_MAX_VALUE_LEN];
+    char szModeName[KEY_MAX_LEN];
+    char szModeParms[KEY_MAX_VALUE_LEN];
     uint32_t u32ClientId = 0;
-    RTStrPrintf(pcModeName, sizeof(pcModeName), "VideoMode/%s", pszName);
-    RTStrPrintf(pcModeParms, sizeof(pcModeParms), "%dx%dx%d", cx, cy, cBits);
+    RTStrPrintf(szModeName, sizeof(szModeName), "VideoMode/%s", pszName);
+    RTStrPrintf(szModeParms, sizeof(szModeParms), "%dx%dx%d", cx, cy, cBits);
     int rc = VbglR3InfoSvcConnect(&u32ClientId);
     if (RT_SUCCESS(rc))
-        rc = VbglR3InfoSvcWriteKey(u32ClientId, pcModeName, pcModeParms);
+        rc = VbglR3InfoSvcWriteKey(u32ClientId, szModeName, szModeParms);
     if (u32ClientId != 0)
         VbglR3InfoSvcDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
@@ -263 +263 @@
 /**
  * Retrieve video mode parameters from the registry.
- * 
+ *
  * @returns iprt status value
  * @param   pszName the name under which the mode parameters are saved
@@ -270 +270 @@
  * @param   pcBits  where to store the bits per pixel for the mode
  */
-VBGLR3DECL(int) VbglR3RetrieveVideoMode(char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
+VBGLR3DECL(int) VbglR3RetrieveVideoMode(const char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
 {
     using namespace svcInfo;
 
-    char pcModeName[KEY_MAX_LEN];
-    char pcModeParms[KEY_MAX_VALUE_LEN];
+    char szModeParms[KEY_MAX_VALUE_LEN];
     char *pszNext;
     uint32_t u32ClientId = 0;
     uint32_t cx, cy, cBits;
 
-    RTStrPrintf(pcModeName, sizeof(pcModeName), "VideoMode/%s", pszName);
     int rc = VbglR3InfoSvcConnect(&u32ClientId);
     if (RT_SUCCESS(rc))
-        rc = VbglR3InfoSvcReadKey(u32ClientId, pcModeName, pcModeParms,
-                                  sizeof(pcModeParms), NULL);
+    {
+        char szModeName[KEY_MAX_LEN];
+        RTStrPrintf(szModeName, sizeof(szModeName), "VideoMode/%s", pszName);
+        rc = VbglR3InfoSvcReadKey(u32ClientId, szModeName, szModeParms,
+                                  sizeof(szModeParms), NULL); /** @todo add a VbglR3InfoSvcReadKeyF/FV that does the RTStrPrintf for you. */
+    }
+/** @todo r=bird: this is kind of ugly.
+ * What about just fixing the format as "CXxCYxCBITS" and then split it up into three strings by searching for the
+ * two 'x'es. And then apply RTStrToUInt32Full to these in turn.
+ * Also, the use of VERR_INVALID_PARAMETER seems inappropriate and confusing here. */
     if (RT_SUCCESS(rc))
         /* Extract the width from the string */
-        rc = RTStrToUInt32Ex(pcModeParms, &pszNext, 10, &cx);
+        rc = RTStrToUInt32Ex(szModeParms, &pszNext, 10, &cx);
     if (   (VWRN_NUMBER_TOO_BIG == rc)
         || (VWRN_NEGATIVE_UNSIGNED == rc)